EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-29 04:04: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

5
src/main/java/com/plotsquared/bukkit/BukkitMain.java
View File

@ -193,6 +193,11 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain
return getDataFolder();
}
@Override
public File getWorldContainer() {
return Bukkit.getWorldContainer();
}
@Override
public TaskManager getTaskManager()
{

28
src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java
View File

@ -137,10 +137,9 @@ public class BukkitChunkManager extends ChunkManager
public void run()
{
final String directory = world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z + ".mca";
final File file = new File(directory);
PS.debug("&6 - Deleting region: " + file.getName() + " (approx 1024 chunks)");
if (file.exists())
{
final File file = new File(PS.get().IMP.getWorldContainer(), directory);
PS.log("&6 - Deleting region: " + file.getName() + " (approx 1024 chunks)");
if (file.exists()) {
file.delete();
}
try
@ -154,23 +153,28 @@ public class BukkitChunkManager extends ChunkManager
}
@Override
public void deleteRegionFiles(final String world, final List<ChunkLoc> chunks)
{
TaskManager.runTaskAsync(new Runnable()
{
public void deleteRegionFiles(String world, List<ChunkLoc> chunks) {
deleteRegionFiles(world, chunks, null);
}
@Override
public void deleteRegionFiles(final String world, final List<ChunkLoc> chunks, final Runnable whenDone) {
TaskManager.runTaskAsync(new Runnable() {
@Override
public void run()
{
for (final ChunkLoc loc : chunks)
{
final String directory = world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z + ".mca";
final File file = new File(directory);
PS.debug("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
if (file.exists())
{
final File file = new File(PS.get().IMP.getWorldContainer(), directory);
PS.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
if (file.exists()) {
file.delete();
}
}
if (whenDone != null) {
whenDone.run();
}
}
});
}

8
src/main/java/com/plotsquared/sponge/SpongeMain.java
View File

@ -491,8 +491,12 @@ public class SpongeMain implements IPlotMain, PluginContainer
}
@Override
public void disable()
{
public File getWorldContainer() {
return new File("world");
}
@Override
public void disable() {
PS.get().disable();
THIS = null;
}

5
src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java
View File

@ -139,6 +139,11 @@ public class SpongeChunkManager extends ChunkManager
}
@Override
public void deleteRegionFiles(String world, List<ChunkLoc> chunks, Runnable whenDone) {
// TODO Auto-generated method stub
}
@Override
public Plot hasPlot(final String world, final ChunkLoc chunk)
{