Fix trimming for worlds in non-standard directories

This commit is contained in:
Byteflux
2015-09-09 22:34:41 -07:00
parent 66730794d6
commit 629ff443f3
7 changed files with 50 additions and 15 deletions

View File

@ -63,7 +63,7 @@ public class Trim extends SubCommand {
@Override
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) {
final String name = file.getName();
@ -155,12 +155,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);
PS.log("&3PlotSquared -> World trim&8: &7" + message);
}
public PlotId getId(final String id) {
@ -211,8 +211,12 @@ public class Trim extends SubCommand {
getTrimRegions(empty, world, new Runnable() {
@Override
public void run() {
deleteChunks(world, empty);
PS.log("$1Trim task complete!");
deleteChunks(world, empty, new Runnable() {
@Override
public void run() {
PS.log("$1Trim task complete!");
}
});
}
});
return true;