Several changes:

- Several API improvements
- persistent WorldEdit bypass toggle
- persistent plot chat toggle
- Plot BO3 exporting (useful f
- Fix fastmode clearing unclaim border
- Add player-interact flag for NPC interaction etc. Fixes #543
- Several fixes for sponge
- some code cleanup
- Closes #529
This commit is contained in:
boy0001
2015-08-18 23:20:11 +10:00
parent fcfd6616be
commit b059de5098
43 changed files with 1067 additions and 473 deletions

View File

@ -167,7 +167,7 @@ public class HybridPlotManager extends ClassicPlotManager {
* to have 512x512 sized plots
*/
@Override
public boolean clearPlot(final PlotWorld plotworld, final Plot plot, final boolean isDelete, final Runnable whenDone) {
public boolean clearPlot(final PlotWorld plotworld, final Plot plot, final Runnable whenDone) {
final String world = plotworld.worldname;
final HybridPlotWorld dpw = ((HybridPlotWorld) plotworld);
@ -181,8 +181,6 @@ public class HybridPlotManager extends ClassicPlotManager {
final PlotBlock[] bedrock = (dpw.PLOT_BEDROCK ? new PlotBlock[] { new PlotBlock((short) 7, (byte) 0) } : filling);
final PlotBlock air = new PlotBlock((short) 0, (byte) 0);
setWallFilling(dpw, plot.id, new PlotBlock[] { dpw.WALL_FILLING });
ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
@Override
public void run() {
@ -216,11 +214,6 @@ public class HybridPlotManager extends ClassicPlotManager {
}, new Runnable() {
@Override
public void run() {
// When we are done with the inside of the plot, we can reset the wall / border
final PlotBlock wall = isDelete ? dpw.WALL_BLOCK : dpw.CLAIMED_WALL_BLOCK;
if (wall.id != 0 || !dpw.WALL_BLOCK.equals(dpw.CLAIMED_WALL_BLOCK)) {
setWall(dpw, plot.id, new PlotBlock[] { wall });
}
// And notify whatever called this when plot clearing is done
SetBlockQueue.addNotify(whenDone);
}