mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-18 05:14:42 +02:00
Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared
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:
@ -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;
|
||||
}
|
||||
|
@ -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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user