Minor fixes

src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java

@@ -89,17 +89,17 @@ public class DebugExec extends SubCommand {
     private Bindings scope;
     
     public DebugExec() {
-        File file = new File(PS.get().IMP.getDirectory(), "scripts" + File.separator + "start.js");
+        try {
-        if (file.exists()) {
+            File file = new File(PS.get().IMP.getDirectory(), "scripts" + File.separator + "start.js");
-            init();
+            if (file.exists()) {
-            try {
+                init();
-                String script = StringMan.join(Files.readLines(new File(new File(PS.get().IMP.getDirectory() + File.separator + "scripts"), "start.js"), StandardCharsets.UTF_8), System.getProperty("line.separator"));
+                    String script = StringMan.join(Files.readLines(new File(new File(PS.get().IMP.getDirectory() + File.separator + "scripts"), "start.js"), StandardCharsets.UTF_8), System.getProperty("line.separator"));
-                scope.put("THIS", this);
+                    scope.put("THIS", this);
-                scope.put("PlotPlayer", ConsolePlayer.getConsole());
+                    scope.put("PlotPlayer", ConsolePlayer.getConsole());
-                engine.eval(script, scope);
+                    engine.eval(script, scope);
-            } catch (Exception e) {
-                e.printStackTrace();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
     

src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java

@@ -47,6 +47,9 @@ public class Unclaim extends SubCommand {
         if (plot == null) {
             return !sendMessage(plr, C.NOT_IN_PLOT);
         }
+        if (!plot.hasOwner()) {
+            return !sendMessage(plr, C.PLOT_NOT_CLAIMED);
+        }
         if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
             return !sendMessage(plr, C.UNLINK_REQUIRED);
         }

src/main/java/com/plotsquared/bukkit/util/SendChunk.java

@@ -42,7 +42,9 @@ public class SendChunk {
     private final RefClass classConnection = getRefClass("{nms}.PlayerConnection");
     private final RefClass classChunk = getRefClass("{nms}.Chunk");
     private final RefClass classCraftPlayer = getRefClass("{cb}.entity.CraftPlayer");
+    private final RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
     private RefMethod methodGetHandlePlayer;
+    private RefMethod methodGetHandleChunk;
     private RefConstructor MapChunk;
     private RefField connection;
     private RefMethod send;
@@ -54,6 +56,7 @@ public class SendChunk {
      */
     public SendChunk() throws NoSuchMethodException {
         methodGetHandlePlayer = classCraftPlayer.getMethod("getHandle");
+        methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
         MapChunk = classMapChunk.getConstructor(classChunk.getRealClass(), boolean.class, int.class);
         connection = classEntityPlayer.getField("playerConnection");
         send = classConnection.getMethod("sendPacket", classPacket.getRealClass());
@@ -101,19 +104,15 @@ public class SendChunk {
                 if (dx > view || dz > view) {
                     continue;
                 }
+                Object c = methodGetHandleChunk.of(chunk).call();
                 chunks.remove(chunk);
-                
-                Object packet = MapChunk.create(chunk, true, 0);
                 Object con = connection.of(entity).get();
+                if (dx != 0 || dz != 0) {
+                    Object packet = MapChunk.create(c, true, 1);
+                    send.of(con).call(packet);
+                }
+                Object packet = MapChunk.create(c, true, 65565);
                 send.of(con).call(packet);
-                packet = MapChunk.create(chunk, true, 65565);
-                send.of(con).call(packet);
-//                Object packet = MapChunk.create(chunk, true, 0);
-//                
-//                PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(chunk, true, 0);
-//                entity.playerConnection.sendPacket(packet);
-//                packet = new PacketPlayOutMapChunk(chunk, true, 65565);
-//                entity.playerConnection.sendPacket(packet);
             }
         }
         for (final Chunk chunk : chunks) {

src/main/java/com/plotsquared/bukkit/util/SetBlockFast.java

@@ -131,6 +131,7 @@ public class SetBlockFast extends BukkitSetBlockManager {
         try {
             chunksender.sendChunk(chunks);
         } catch (final Throwable e) {
+            e.printStackTrace();
             MainUtil.canSendChunk = false;
         }
     }

src/main/java/com/plotsquared/bukkit/util/SetBlockFast_1_8.java

@@ -349,6 +349,7 @@ public class SetBlockFast_1_8 extends BukkitSetBlockManager {
         try {
             chunksender.sendChunk(chunks);
         } catch (final Throwable e) {
+            e.printStackTrace();
             MainUtil.canSendChunk = false;
         }
     }

src/main/java/com/plotsquared/general/commands/Command.java

@@ -136,6 +136,9 @@ public abstract class Command<E extends CommandCaller> extends CommandManager {
     }
 
     final public Argument<?>[] getRequiredArguments() {
+        if (this.requiredArguments == null) {
+            return new Argument<?>[0];
+        }
         return this.requiredArguments;
     }
 

src/main/java/com/plotsquared/sponge/SpongeMain.java

@@ -12,7 +12,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
 
 import org.slf4j.Logger;
 import org.spongepowered.api.CatalogType;
@@ -21,7 +20,6 @@ import org.spongepowered.api.Server;
 import org.spongepowered.api.block.BlockState;
 import org.spongepowered.api.block.BlockType;
 import org.spongepowered.api.block.BlockTypes;
-import org.spongepowered.api.data.manipulator.mutable.block.StoneData;
 import org.spongepowered.api.entity.player.Player;
 import org.spongepowered.api.event.Subscribe;
 import org.spongepowered.api.event.entity.player.PlayerChatEvent;

src/main/java/com/plotsquared/sponge/generator/WorldModify.java

@@ -34,6 +34,8 @@ public class WorldModify implements WorldGeneratorModifier {
             }
         }
         else {
+            gen.getGeneratorPopulators().clear();
+            gen.getPopulators().clear();
             gen.setBaseGeneratorPopulator(plotgen.getBaseGeneratorPopulator());
             gen.setBiomeGenerator(plotgen.getBiomeGenerator());
         }