EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Finished unlink augmented

Browse Source
This commit is contained in:
boy0001 2015-05-01 22:44:33 +10:00
parent 1e6db07e3a
commit d53c2de419
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@ -94,6 +94,7 @@ public class MainUtil {
myplot.settings.setMerged(new boolean[] { false, false, false, false }); myplot.settings.setMerged(new boolean[] { false, false, false, false });
DBFunc.setMerged(world, myplot, myplot.settings.getMerged()); DBFunc.setMerged(world, myplot, myplot.settings.getMerged());
} }
if (plotworld.TERRAIN != 3) {
for (int x = pos1.x; x <= pos2.x; x++) { for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) { for (int y = pos1.y; y <= pos2.y; y++) {
final boolean lx = x < pos2.x; final boolean lx = x < pos2.x;
@ -111,6 +112,7 @@ public class MainUtil {
MainUtil.setSign(UUIDHandler.getName(plot.owner), plot); MainUtil.setSign(UUIDHandler.getName(plot.owner), plot);
} }
} }
}
manager.finishPlotUnlink(plotworld, ids); manager.finishPlotUnlink(plotworld, ids);
for (final PlotId id : ids) { for (final PlotId id : ids) {
final Plot myPlot = MainUtil.getPlot(world, id); final Plot myPlot = MainUtil.getPlot(world, id);
@ -454,14 +456,15 @@ public class MainUtil {
public static void removeRoadSouthEast(PlotWorld plotworld, Plot plot) { public static void removeRoadSouthEast(PlotWorld plotworld, Plot plot) {
if (plotworld.TYPE != 0 && plotworld.TERRAIN > 1) { if (plotworld.TYPE != 0 && plotworld.TERRAIN > 1) {
if (plotworld.TERRAIN == 3) {
return;
}
PlotId id = plot.id; PlotId id = plot.id;
PlotId id2 = new PlotId(id.x + 1, id.y + 1); PlotId id2 = new PlotId(id.x + 1, id.y + 1);
Location pos1 = getPlotTopLoc(plot.world, id).add(1, 0, 1); Location pos1 = getPlotTopLoc(plot.world, id).add(1, 0, 1);
Location pos2 = getPlotBottomLoc(plot.world, id2); Location pos2 = getPlotBottomLoc(plot.world, id2);
pos1.setY(0); pos1.setY(0);
pos2.setY(256); pos2.setY(256);
System.out.print(pos1);
System.out.print(pos2);
ChunkManager.manager.regenerateRegion(pos1, pos2, null); ChunkManager.manager.regenerateRegion(pos1, pos2, null);
} }
else { else {
@ -471,14 +474,15 @@ public class MainUtil {
public static void removeRoadEast(PlotWorld plotworld, Plot plot) { public static void removeRoadEast(PlotWorld plotworld, Plot plot) {
if (plotworld.TYPE != 0 && plotworld.TERRAIN > 1) { if (plotworld.TYPE != 0 && plotworld.TERRAIN > 1) {
if (plotworld.TERRAIN == 3) {
return;
}
PlotId id = plot.id; PlotId id = plot.id;
PlotId id2 = new PlotId(id.x + 1, id.y); PlotId id2 = new PlotId(id.x + 1, id.y);
Location bot = getPlotBottomLocAbs(plot.world, id2); Location bot = getPlotBottomLocAbs(plot.world, id2);
Location top = getPlotTopLocAbs(plot.world, id); Location top = getPlotTopLocAbs(plot.world, id);
Location pos1 = new Location(plot.world, top.getX() + 1, 0, bot.getZ() + 1); Location pos1 = new Location(plot.world, top.getX() + 1, 0, bot.getZ() + 1);
Location pos2 = new Location(plot.world, bot.getX(), 256, top.getZ()); Location pos2 = new Location(plot.world, bot.getX(), 256, top.getZ());
System.out.print(pos1);
System.out.print(pos2);
ChunkManager.manager.regenerateRegion(pos1, pos2, null); ChunkManager.manager.regenerateRegion(pos1, pos2, null);
} }
else { else {
@ -488,14 +492,15 @@ public class MainUtil {
public static void removeRoadSouth(PlotWorld plotworld, Plot plot) { public static void removeRoadSouth(PlotWorld plotworld, Plot plot) {
if (plotworld.TYPE != 0 && plotworld.TERRAIN > 1) { if (plotworld.TYPE != 0 && plotworld.TERRAIN > 1) {
if (plotworld.TERRAIN == 3) {
return;
}
PlotId id = plot.id; PlotId id = plot.id;
PlotId id2 = new PlotId(id.x, id.y + 1); PlotId id2 = new PlotId(id.x, id.y + 1);
Location bot = getPlotBottomLocAbs(plot.world, id2); Location bot = getPlotBottomLocAbs(plot.world, id2);
Location top = getPlotTopLocAbs(plot.world, id); Location top = getPlotTopLocAbs(plot.world, id);
Location pos1 = new Location(plot.world, bot.getX() + 1, 0, top.getZ() + 1); Location pos1 = new Location(plot.world, bot.getX() + 1, 0, top.getZ() + 1);
Location pos2 = new Location(plot.world, top.getX(), 256, bot.getZ()); Location pos2 = new Location(plot.world, top.getX(), 256, bot.getZ());
System.out.print(pos1);
System.out.print(pos2);
ChunkManager.manager.regenerateRegion(pos1, pos2, null); ChunkManager.manager.regenerateRegion(pos1, pos2, null);
} }
else { else {