more trim'n

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

@@ -51,6 +51,8 @@ import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -117,13 +119,17 @@ import org.bukkit.entity.Player;
             }
             PlayerFunctions.sendMessage(plr, "Modified: "+modified);
             // trim ID
+            return true;
+        }
+        if (!arg.equals("all")) {
+            PlayerFunctions.sendMessage(plr, C.TRIM_SYNTAX);
+            return false;
         }
-        if (arg.equals("all")) {
         sendMessage("Initializing...");
         String directory = new File(".").getAbsolutePath() + File.separator + world.getName() + File.separator + "region";
         File folder = new File(directory);
         File[] regionFiles = folder.listFiles();
-            ArrayList<ChunkLoc> chunks = new ArrayList<>();
+        ArrayList<ChunkLoc> chunkChunks = new ArrayList<>();
         sendMessage("Step 1: Bulk chunk trim");
         
         int count = 0;
@@ -155,7 +161,7 @@ import org.bukkit.entity.Player;
                             int x = Integer.parseInt(split[1]);
                             int z = Integer.parseInt(split[2]);
                             ChunkLoc loc = new ChunkLoc(x, z);
-                                chunks.add(loc);
+                            chunkChunks.add(loc);
                         }
                         catch (Exception e) {  }
                     }
@@ -165,6 +171,10 @@ import org.bukkit.entity.Player;
         
         count = 0;
         PlotMain.sendConsoleSenderMessage("&6 - bulk trim removed " + (count * 256) + " chunks");
+        if (manager == null) {
+            sendMessage("Could not continue as the selected world is not a HybridPlotWorld");
+            return false;
+        }
         sendMessage("Step 2: Plot trim");
         {
             Set<Plot> plots = getOldPlots(world.getName());
@@ -174,17 +184,35 @@ import org.bukkit.entity.Player;
                 if (plot.hasOwner()) {
                     modified = HybridPlotManager.checkModified(plot, 0);
                 }
-                    if (plot.owner == null || HybridPlotManager.checkModified(plot, manager.REQUIRED_CHANGES));
+                if (plot.owner == null || !HybridPlotManager.checkModified(plot, plotworld.REQUIRED_CHANGES)) {
+                    PlotMain.removePlot(worldname, id, true);
+                    count++;
+                }
             }
         }
-            
-            
         PlotMain.sendConsoleSenderMessage("&6 - plot trim removed " + count + " plots");
         sendMessage("Step 3: Chunk trim");
+        for (ChunkLoc loc : chunkChunks) {
+            int sx = loc.x << 4;
+            int sz = loc.z << 4;
             
+            boolean delete = true;
+            
+            loop:
+            for (int x = sx; x < sx + 16; x++) {
+                for (int z = sz; z < sz + 16; z++) {
+                    Chunk chunk = world.getChunkAt(x, z);
+                    if (hasPlot(world, chunk)) {
+                        delete = false;
+                        break loop;
                     }
-        PlayerFunctions.sendMessage(plr, C.TRIM_SYNTAX);
+                }
-        return false;
+            }
+            if (delete) {
+                deleteRegionFile(worldname, loc);
+            }
+        }
+        return true;
     }
     
     public Set<Plot> getOldPlots(String world) {
@@ -218,6 +246,35 @@ import org.bukkit.entity.Player;
         return toRemove;
     }
     
+    public void deleteRegionFile(String world, ChunkLoc loc) {
+        String directory = new File(".").getAbsolutePath() + File.separator + world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z + ".mca";
+        File file = new File(directory);
+        if (file.exists()) {
+            file.delete();
+        }
+        
+    }
+    
+    private boolean hasPlot(World world, Chunk chunk) {
+        int x1 = chunk.getX() << 4;
+        int z1 = chunk.getZ() << 4;
+        int x2 = x1 + 15;
+        int z2 = z1 + 15;
+        
+        Location bot = new Location(world, x1, 0, z1);
+        Plot plot;
+        plot = PlotHelper.getCurrentPlot(bot); 
+        if (plot.owner != null) {
+            return true;
+        }
+        Location top = new Location(world, x2, 0, z2);
+        plot = PlotHelper.getCurrentPlot(top); 
+        if (plot.owner != null) {
+            return true;
+        }
+        return false;
+    }
+    
     private void sendMessage(final String message) {
         PlotMain.sendConsoleSenderMessage("&3PlotSquared -> World trim&8: " + message);
     }

PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java

@@ -45,7 +45,6 @@ public class HybridPlotWorld extends PlotWorld {
      * are used as little as possible to optimize math performance in many of
      * the functions/algorithms
      */
-
     /**
      * Default Road Height: 64
      */
@@ -139,6 +138,8 @@ public class HybridPlotWorld extends PlotWorld {
     public short OFFSET;
     public short SCHEMATIC_HEIGHT;
     
+    public short REQUIRED_CHANGES = 0;
+
     /*
      * Here we are just calling the super method, nothing special
      */