Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-06-22 09:45:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

added startMerge to plotManager

Browse Source
This commit is contained in:
boy0001 2014-10-18 15:49:08 +11:00
parent fc9a31cbf4
commit 04e8c5a8c4
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
View File

@ -100,7 +100,9 @@ public class PlotHelper {
PlotManager manager = PlotMain.getPlotManager(world);
PlotWorld plotworld = PlotMain.getWorldSettings(world);
manager.startPlotMerge(world, plotworld, plotIds);
for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) {

4
PlotSquared/src/com/intellectualcrafters/plot/PlotManager.java
View File

@ -60,6 +60,10 @@ public abstract class PlotManager {
public abstract boolean removeRoadSouth(PlotWorld plotworld, Plot plot);
public abstract boolean removeRoadSouthEast(PlotWorld plotworld, Plot plot);
public abstract boolean startPlotMerge(World world, PlotWorld plotworld, ArrayList<PlotId> plotIds);
public abstract boolean startPlotUnlink(World world, PlotWorld plotworld, ArrayList<PlotId> plotIds);
public abstract boolean finishPlotMerge(World world, PlotWorld plotworld, ArrayList<PlotId> plotIds);

8
PlotSquared/src/com/intellectualcrafters/plot/commands/Unlink.java
View File

@ -65,6 +65,11 @@ public class Unlink extends SubCommand {
return false;
}
PlotManager manager = PlotMain.getPlotManager(world);
PlotWorld plotworld = PlotMain.getWorldSettings(world);
manager.startPlotUnlink(world, plotworld, ids);
for (PlotId id : ids) {
Plot myplot = PlotMain.getPlots(world).get(id);
@ -78,8 +83,7 @@ public class Unlink extends SubCommand {
myplot.settings.setMerged(new boolean[] { false, false, false, false });
DBFunc.setMerged(world.getName(), myplot, myplot.settings.getMerged());
}
PlotManager manager = PlotMain.getPlotManager(world);
PlotWorld plotworld = PlotMain.getWorldSettings(world);
for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) {
boolean lx = x < pos2.x;

10
PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotManager.java
View File

@ -602,4 +602,14 @@ public class DefaultPlotManager extends PlotManager {
public boolean finishPlotUnlink(World world, PlotWorld plotworld, ArrayList<PlotId> plotIds) {
return true;
}
@Override
public boolean startPlotMerge(World world, PlotWorld plotworld, ArrayList<PlotId> plotIds) {
return true;
}
@Override
public boolean startPlotUnlink(World world, PlotWorld plotworld, ArrayList<PlotId> plotIds) {
return true;
}
}