EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 18:24:43 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared

Browse Source 
Conflicts:
	src/main/java/com/intellectualcrafters/plot/IPlotMain.java
	src/main/java/com/intellectualcrafters/plot/commands/Trim.java
	src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java
	src/main/java/com/plotsquared/bukkit/BukkitMain.java
	src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java
	src/main/java/com/plotsquared/sponge/SpongeMain.java
	src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java
This commit is contained in:
boy0001
2015-09-13 13:46:45 +10:00
parent c163446f7e 063a369d8d
commit 1cccdd9d4d
10 changed files with 80 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/intellectualcrafters/plot/commands/Trim.java
View File

@ -64,7 +64,7 @@ public class Trim extends SubCommand
public void run()
{
final String directory = world + File.separator + "region";
final File folder = new File(directory);
final File folder = new File(PS.get().IMP.getWorldContainer(), directory);
final File[] regionFiles = folder.listFiles();
for (final File file : regionFiles)
{
@ -175,14 +175,12 @@ public class Trim extends SubCommand
return true;
}
public static void deleteChunks(final String world, final ArrayList<ChunkLoc> chunks)
{
ChunkManager.manager.deleteRegionFiles(world, chunks);
public static void deleteChunks(final String world, final ArrayList<ChunkLoc> chunks, final Runnable whenDone) {
ChunkManager.manager.deleteRegionFiles(world, chunks, whenDone);
}
public static void sendMessage(final String message)
{
PS.debug("&3PlotSquared -> World trim&8: &7" + message);
public static void sendMessage(final String message) {
PS.log("&3PlotSquared -> World trim&8: &7" + message);
}
public PlotId getId(final String id)
@ -244,11 +242,13 @@ public class Trim extends SubCommand
final ArrayList<ChunkLoc> empty = new ArrayList<>();
getTrimRegions(empty, world, new Runnable()
{
@Override
public void run()
{
deleteChunks(world, empty);
PS.log("$1Trim task complete!");
public void run() {
deleteChunks(world, empty, new Runnable() {
@Override
public void run() {
PS.log("$1Trim task complete!");
}
});
}
});
return true;