Async schematic pasting

- We should replace the schematic on claim with this.
- worldedit listener now listens to plot deletion
- debugclaimtest command no longer pastes any schematics if there is on
set

PlotSquared/src/main/java/com/intellectualcrafters/plot/C.java

@@ -207,7 +207,7 @@ public enum C {
      * Info
      */
     PLOT_INFO_UNCLAIMED("&cPlot &6%s&c is not yet claimed"),
-    PLOT_INFO("&6ID&7: &a%id%&7\n&6Alias&7: &a%alias%\n&6Owner&7: &a%owner%\n&6Description&7: &a%desc%\n&6Rating&7: &a%rating%&7/&a10\n&6Can build&7: &a%build%"),
+    PLOT_INFO("&6ID&7: &a%id%&7\n&6Alias&7: &a%alias%\n&6Owner&7: &a%owner%\n&6Helpers&7: &a%helpers%\n&6Trusted&7: &a%trusted%\n&Denied&7: &a%denied%\n&6Denied&7: &a%denied%\n&6Flags&7: &a%flags%\n&6Biome&7: &a%biome%\n&6Rating&7: &a%rating%&7/&a10\n&6Can build&7: &a%build%"),
     
     PLOT_INFO_HELPERS("&6Helpers&7: %helpers%"),
     PLOT_INFO_TRUSTED("&6Trusted&7: %trusted%"),

PlotSquared/src/main/java/com/intellectualcrafters/plot/PWE.java

@@ -80,6 +80,24 @@ public class PWE {
 		return s.getMask() == null;
 	}
 
+	public static void setNoMask(Player p) {
+	    try {
+    	    LocalSession s;
+            if (PlotMain.worldEdit == null) {
+                s = WorldEdit.getInstance().getSession(p.getName());
+            }
+            else {
+                s = PlotMain.worldEdit.getSession(p);
+            }
+    	    BukkitPlayer plr = PlotMain.worldEdit.wrapPlayer(p);
+            Vector p1 = new Vector(69, 69, 69), p2 = new Vector(69, 69, 69);
+            s.setMask(new RegionMask(new CuboidRegion(plr.getWorld(), p1, p2)));
+	    }
+	    catch (Exception e) {
+	        
+	    }
+    }
+	
 	public static void removeMask(Player p, LocalSession s) {
 	    Mask mask = null;
 	    s.setMask(mask);

PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotHelper.java

@@ -266,18 +266,19 @@ public class PlotHelper {
 	 * @param block
 	 * @param plotblock
 	 */
-	public static void setBlock(Block block, PlotBlock plotblock) {
+	public static boolean setBlock(Block block, PlotBlock plotblock) {
 
 		if (canSetFast) {
-			if (block.getTypeId() != plotblock.id && plotblock.data != block.getData()) {
+			if (block.getTypeId() != plotblock.id || plotblock.data != block.getData()) {
 				try {
 					SetBlockFast.set(block.getWorld(), block.getX(), block.getY(), block.getZ(), plotblock.id, plotblock.data);
-					return;
+					return true;
 				}
 				catch (NoSuchMethodException e) {
 					canSetFast = false;
 				}
 			}
+			return false;
 		}
 		if (block.getData() == plotblock.data) {
 			if (block.getTypeId() != plotblock.id) {
@@ -292,6 +293,7 @@ public class PlotHelper {
 				block.setTypeIdAndData(plotblock.id, plotblock.data, false);
 			}
 		}
+		return false;
 	}
 
 	/**

PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java

@@ -115,10 +115,9 @@ public class PlotMain extends JavaPlugin {
 		return new WorldGenerator(worldname);
 	}
 
-	@SuppressWarnings("deprecation")
 	public static void checkForExpiredPlots() {
 		final JavaPlugin plugin = PlotMain.getMain();
-		Bukkit.getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() {
+		Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
 			@Override
 			public void run() {
 				checkExpired(plugin, true);
@@ -1217,7 +1216,7 @@ public class PlotMain extends JavaPlugin {
 		options.put("mysql.user", "root");
 		options.put("mysql.password", "password");
 		options.put("mysql.database", "plot_db");
-        options.put("prefix", "plotsquared_");
+        options.put("prefix", "");
 		for (Entry<String, Object> node : options.entrySet()) {
 			if (!storage.contains(node.getKey())) {
 				storage.set(node.getKey(), node.getValue());

PlotSquared/src/main/java/com/intellectualcrafters/plot/SchematicHandler.java

@@ -7,6 +7,7 @@ import org.bukkit.block.Block;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import com.intellectualcrafters.jnbt.*;
+import com.intellectualcrafters.plot.SchematicHandler.DataCollection;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -27,7 +28,6 @@ import java.util.zip.GZIPOutputStream;
  */
 @SuppressWarnings({"all"})
 public class SchematicHandler {
-
     /**
      * Paste a schematic
      * @param location origin
@@ -35,13 +35,12 @@ public class SchematicHandler {
      * @param plot plot to paste in
      * @return true if succeeded
      */
-	public static boolean paste(Location location, Schematic schematic, Plot plot) {
+	public static boolean paste(Location location, Schematic schematic, Plot plot, int x_offset, int z_offset) {
 		if (schematic == null) {
 			PlotMain.sendConsoleSenderMessage("Schematic == null :|");
 			return false;
 		}
 		try {
-		    
 		    Dimension demensions = schematic.getSchematicDimension();
 	        
 		    int WIDTH = demensions.getX();
@@ -68,7 +67,7 @@ public class SchematicHandler {
 	                    short id = blocks[index].getBlock();
 	                    byte data = blocks[index].getData();
 	                    
-	                    Block block = world.getBlockAt(l1.getBlockX()+x, l1.getBlockY()+y, l1.getBlockZ()+z);
+	                    Block block = world.getBlockAt(l1.getBlockX()+x+x_offset, l1.getBlockY()+y, l1.getBlockZ()+z+z_offset);
 	                    
 	                    PlotBlock plotblock = new PlotBlock(id, data);
 	                    
@@ -274,9 +273,9 @@ public class SchematicHandler {
             PlotMain.sendConsoleSenderMessage("&7 - Cannot save: corrupt chunk at "+(i/16)+", "+(j/16));
             return null;
         }
-        int width = pos2.getBlockX()-pos1.getBlockX();
+        int width = pos2.getBlockX()-pos1.getBlockX()+1;
         int height = 256;
-        int length = pos2.getBlockZ()-pos1.getBlockZ();
+        int length = pos2.getBlockZ()-pos1.getBlockZ()+1;
 
         HashMap<String, Tag> schematic = new HashMap<>();
         schematic.put("Width", new ShortTag("Width", (short) width));
@@ -354,4 +353,36 @@ public class SchematicHandler {
 			return this.data;
 		}
 	}
+
+    public static boolean pastePart(World world, DataCollection[] blocks, Location l1, int x_offset, int z_offset, int i1, int i2, int WIDTH, int LENGTH) {
+        boolean result = false;
+        for (int i = i1; i<=i2 ;i++) {
+            short id = blocks[i].getBlock();
+            byte data = blocks[i].getData();
+                if (id==0) {
+                    continue;
+                }
+            
+            int area = WIDTH*LENGTH;
+            int r = i%(area);
+
+            int x = r%WIDTH;
+            int y = i/area;
+            int z = r/WIDTH;
+            
+            if (y>256) {
+                break;
+            }
+            
+            Block block = world.getBlockAt(l1.getBlockX()+x+x_offset, l1.getBlockY()+y, l1.getBlockZ()+z+z_offset);
+            
+            PlotBlock plotblock = new PlotBlock(id, data);
+            
+            boolean set = PlotHelper.setBlock(block, plotblock);
+            if (!result && set) {
+                result = true;
+            }
+        }
+        return result;
+    }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java

@@ -110,7 +110,7 @@ public class Claim extends SubCommand {
 						sch = SchematicHandler.getSchematic(world.SCHEMATIC_FILE);
 					}
 				}
-				SchematicHandler.paste(player.getLocation(), sch, plot);
+				SchematicHandler.paste(player.getLocation(), sch, plot, 0, 0);
 			}
 			if (world.DEFAULT_FLAGS != null && world.DEFAULT_FLAGS.size() > 0) {
 			    plot.settings.setFlags(FlagManager.parseFlags(PlotMain.getWorldSettings(player.getWorld()).DEFAULT_FLAGS));

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java

@@ -175,21 +175,6 @@ public class DebugClaimTest extends SubCommand {
 			if (teleport) {
 				PlotMain.teleportPlayer(player, player.getLocation(), plot);
 			}
-			PlotWorld world = PlotMain.getWorldSettings(plot.getWorld());
-			if (world.SCHEMATIC_ON_CLAIM) {
-				SchematicHandler handler = new SchematicHandler();
-				SchematicHandler.Schematic sch;
-				if (schematic.equals("")) {
-					sch = handler.getSchematic(world.SCHEMATIC_FILE);
-				}
-				else {
-					sch = handler.getSchematic(schematic);
-					if (sch == null) {
-						sch = handler.getSchematic(world.SCHEMATIC_FILE);
-					}
-				}
-				handler.paste(player.getLocation(), sch, plot);
-			}
 			plot.settings.setFlags(FlagManager.parseFlags(PlotMain.getWorldSettings(player.getWorld()).DEFAULT_FLAGS));
 		}
 		return event.isCancelled();

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Schematic.java

@@ -2,7 +2,11 @@ package com.intellectualcrafters.plot.commands;
 
 import com.intellectualcrafters.jnbt.CompoundTag;
 import com.intellectualcrafters.plot.*;
+import com.intellectualcrafters.plot.SchematicHandler.DataCollection;
+import com.intellectualcrafters.plot.SchematicHandler.Dimension;
+
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -23,8 +27,6 @@ public class Schematic extends SubCommand {
     private int task;
     
     
-	
-	
     @Override
     public boolean execute(final Player plr, String... args) {
         if (args.length < 1) {
@@ -32,15 +34,15 @@ public class Schematic extends SubCommand {
             return true;
         }
         String arg = args[0].toLowerCase();
-		String file;
+        final String file;
-		SchematicHandler.Schematic schematic;
+        final SchematicHandler.Schematic schematic;
         switch (arg) {
         case "paste":
             if (plr==null) {
                 PlotMain.sendConsoleSenderMessage(C.IS_CONSOLE);
                 return false;
             }
-		    if (!PlotMain.hasPermission(plr, "plots.schematic.save")) {
+            if (!PlotMain.hasPermission(plr, "plots.schematic.paste")) {
                 PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.paste");
                 return false;
             }
@@ -52,22 +54,88 @@ public class Schematic extends SubCommand {
                 sendMessage(plr, C.NOT_IN_PLOT);
                 break;
             }
-			file = args[1];
+            if (running) {
-			schematic = SchematicHandler.getSchematic(file);
+                PlayerFunctions.sendMessage(plr, "&cTask is already running.");
-			boolean s = SchematicHandler.paste(plr.getLocation(), schematic, PlayerFunctions.getCurrentPlot(plr));
+                return false; 
-			if (s) {
+            }
-				sendMessage(plr, C.SCHEMATIC_PASTE_SUCCESS);
+            final String file2 = args[1];
+            running = true;
+            this.counter = 0;
+            Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getServer().getPluginManager().getPlugin("PlotSquared"), new Runnable() {
+                @Override
+                public void run() {
+                    final SchematicHandler.Schematic schematic = SchematicHandler.getSchematic(file2);
+                    if (schematic==null) {
+                        sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent or not in gzip format");
+                        running = false;
+                        return;
+                    }
+                    
+                    
+                    final int x;
+                    final int z;
+                    
+                    final Plot plot2 = PlayerFunctions.getCurrentPlot(plr);
+                    
+                    Dimension dem = schematic.getSchematicDimension();
+                    Location bot = PlotHelper.getPlotBottomLoc(plr.getWorld(), plot2.id).add(1, 0, 1);
+                    int length2 = PlotHelper.getPlotWidth(plr.getWorld(), plot2.id);
+                    
+                    if ((dem.getX() > length2) || (dem.getZ() > length2)) {
+                        sendMessage(plr, C.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", dem.getX(), dem.getZ(), length2));
+                        running = false;
+                        return;
+                    }
+                    
+                    if (dem.getX() != length2 || dem.getZ() != length2) {
+                        Location loc = plr.getLocation();
+                        x = Math.min(length2-dem.getX(),loc.getBlockX() - bot.getBlockX());
+                        z = Math.min(length2-dem.getZ(),loc.getBlockZ() - bot.getBlockZ());
                     }
                     else {
-				sendMessage(plr, C.SCHEMATIC_PASTE_FAILED);
+                        x = 0;
+                        z = 0;
                     }
+                    
+                    final World w = plot2.getWorld();
+                    final DataCollection[] b = schematic.getBlockCollection();
+                    int sy = w.getHighestBlockYAt(bot.getBlockX(), bot.getBlockZ());
+                    final Location l1 = bot.add(0, sy-1, 0);
+                    final int WIDTH = schematic.getSchematicDimension().getX();
+                    final int LENGTH = schematic.getSchematicDimension().getZ();
+                    final int blen = b.length-1;
+                    
+                    final Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("PlotSquared");
+                    task = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
+                        @Override
+                        public void run() {
+                            boolean result = false;
+                            while (!result) {
+                                int start = counter*5000;
+                                if (start>blen) {
+                                    sendMessage(plr, C.SCHEMATIC_PASTE_SUCCESS);
+                                    if (PlotHelper.canSetFast) {
+                                        SetBlockFast.update(plr);
+                                    }
+                                    running = false;
+                                    Bukkit.getScheduler().cancelTask(task);
+                                    return;
+                                }
+                                int end = Math.min(start+5000,blen);
+                                result = SchematicHandler.pastePart(w, b, l1, x, z, start, end, WIDTH, LENGTH);
+                                counter++;
+                            }
+                        }
+                    }, 1, 1);
+                }
+            });
             break;
         case "test":
             if (plr==null) {
                 PlotMain.sendConsoleSenderMessage(C.IS_CONSOLE);
                 return false;
             }
-		    if (!PlotMain.hasPermission(plr, "plots.schematic.save")) {
+            if (!PlotMain.hasPermission(plr, "plots.schematic.test")) {
                 PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.test");
                 return false;
             }
@@ -88,7 +156,7 @@ public class Schematic extends SubCommand {
             Plot plot = PlayerFunctions.getCurrentPlot(plr);
             int length = PlotHelper.getPlotWidth(plr.getWorld(), plot.id);
 
-			if ((l1 != length) || (l2 != length)) {
+            if ((l1 < length) || (l2 < length)) {
                 sendMessage(plr, C.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", l1, l2, length));
                 break;
             }

PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java

@@ -4,6 +4,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -25,6 +26,7 @@ import com.intellectualcrafters.plot.PlotHelper;
 import com.intellectualcrafters.plot.PlotId;
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.events.PlotDeleteEvent;
 
 /**
  * @author Citymonstret
@@ -38,6 +40,28 @@ public class WorldEditListener implements Listener {
 		return (PlotMain.isPlotWorld(l.getWorld()));
 	}
 	
+	@EventHandler(
+            priority = EventPriority.LOWEST, ignoreCancelled = true)
+    public void onDelete(PlotDeleteEvent e) {
+	    String world = e.getWorld();
+	    PlotId id = e.getPlotId();
+	    Plot plot = PlotMain.getPlots(world).get(id);
+	    if (plot==null || plot.owner == null) {
+	        return;
+	    }
+	    Player player = Bukkit.getPlayer(plot.owner);
+	    if (player == null) {
+	        return;
+	    }
+	    if (!world.equals(player.getWorld().getName())) {
+	        return;
+	    }
+	    if (PlotMain.hasPermission(player, "plots.worldedit.bypass")) {
+            return;
+        }
+	    PWE.setNoMask(player);
+	}
+
 	@EventHandler(
 			priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public void onInteract(PlayerInteractEvent e) {