mirror of
https://github.com/TotalFreedomMC/TF-PlotSquared.git
synced 2024-12-23 00:15:06 +00:00
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
This commit is contained in:
commit
812d41092e
2 changed files with 33 additions and 9 deletions
|
@ -253,7 +253,7 @@ import java.util.zip.ZipInputStream;
|
||||||
"&c`" + world + "` was not properly loaded - " + IMP.getPluginName()
|
"&c`" + world + "` was not properly loaded - " + IMP.getPluginName()
|
||||||
+ " will now try to load it properly: ");
|
+ " will now try to load it properly: ");
|
||||||
debug(
|
debug(
|
||||||
"&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
|
"&8 - &7Are you trying to delete this world? Remember to remove it from the worlds.yml, bukkit.yml and multiverse worlds.yml");
|
||||||
debug(
|
debug(
|
||||||
"&8 - &7Your world management plugin may be faulty (or non existent)");
|
"&8 - &7Your world management plugin may be faulty (or non existent)");
|
||||||
PlotSquared.this.IMP.setGenerator(world);
|
PlotSquared.this.IMP.setGenerator(world);
|
||||||
|
|
|
@ -949,13 +949,13 @@ public class Plot {
|
||||||
for (Plot current : plots) {
|
for (Plot current : plots) {
|
||||||
if (current.getMerged(Direction.EAST)) {
|
if (current.getMerged(Direction.EAST)) {
|
||||||
manager.createRoadEast(current.area, current);
|
manager.createRoadEast(current.area, current);
|
||||||
if (getMerged(Direction.SOUTH)) {
|
if (current.getMerged(Direction.SOUTH)) {
|
||||||
manager.createRoadSouth(current.area, current);
|
manager.createRoadSouth(current.area, current);
|
||||||
if (getMerged(Direction.SOUTHEAST)) {
|
if (current.getMerged(Direction.SOUTHEAST)) {
|
||||||
manager.createRoadSouthEast(current.area, current);
|
manager.createRoadSouthEast(current.area, current);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (getMerged(Direction.SOUTH)) {
|
} else if (current.getMerged(Direction.SOUTH)) {
|
||||||
manager.createRoadSouth(current.area, current);
|
manager.createRoadSouth(current.area, current);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1667,7 +1667,7 @@ public class Plot {
|
||||||
top.setZ(this.getRelative(Direction.SOUTH).getBottomAbs().getZ() - 1);
|
top.setZ(this.getRelative(Direction.SOUTH).getBottomAbs().getZ() - 1);
|
||||||
}
|
}
|
||||||
if (this.getMerged(Direction.EAST)) {
|
if (this.getMerged(Direction.EAST)) {
|
||||||
top.setX(this.getRelative(Direction.SOUTH).getBottomAbs().getX() - 1);
|
top.setX(this.getRelative(Direction.EAST).getBottomAbs().getX() - 1);
|
||||||
}
|
}
|
||||||
return top;
|
return top;
|
||||||
}
|
}
|
||||||
|
@ -2241,6 +2241,13 @@ public class Plot {
|
||||||
merged.add(current.getId());
|
merged.add(current.getId());
|
||||||
merged.add(other.getId());
|
merged.add(other.getId());
|
||||||
toReturn = true;
|
toReturn = true;
|
||||||
|
|
||||||
|
if (removeRoads) {
|
||||||
|
ArrayList<PlotId> ids = new ArrayList<>();
|
||||||
|
ids.add(current.getId());
|
||||||
|
ids.add(other.getId());
|
||||||
|
this.getManager().finishPlotMerge(this.area, ids);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (max >= 0 && (dir == -1 || dir == 1) && !current.getMerged(Direction.EAST)) {
|
if (max >= 0 && (dir == -1 || dir == 1) && !current.getMerged(Direction.EAST)) {
|
||||||
|
@ -2253,6 +2260,13 @@ public class Plot {
|
||||||
merged.add(current.getId());
|
merged.add(current.getId());
|
||||||
merged.add(other.getId());
|
merged.add(other.getId());
|
||||||
toReturn = true;
|
toReturn = true;
|
||||||
|
|
||||||
|
if (removeRoads) {
|
||||||
|
ArrayList<PlotId> ids = new ArrayList<>();
|
||||||
|
ids.add(current.getId());
|
||||||
|
ids.add(other.getId());
|
||||||
|
this.getManager().finishPlotMerge(this.area, ids);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (max >= 0 && (dir == -1 || dir == 2) && !getMerged(Direction.SOUTH)) {
|
if (max >= 0 && (dir == -1 || dir == 2) && !getMerged(Direction.SOUTH)) {
|
||||||
|
@ -2265,6 +2279,13 @@ public class Plot {
|
||||||
merged.add(current.getId());
|
merged.add(current.getId());
|
||||||
merged.add(other.getId());
|
merged.add(other.getId());
|
||||||
toReturn = true;
|
toReturn = true;
|
||||||
|
|
||||||
|
if (removeRoads) {
|
||||||
|
ArrayList<PlotId> ids = new ArrayList<>();
|
||||||
|
ids.add(current.getId());
|
||||||
|
ids.add(other.getId());
|
||||||
|
this.getManager().finishPlotMerge(this.area, ids);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (max >= 0 && (dir == -1 || dir == 3) && !getMerged(Direction.WEST)) {
|
if (max >= 0 && (dir == -1 || dir == 3) && !getMerged(Direction.WEST)) {
|
||||||
|
@ -2277,13 +2298,16 @@ public class Plot {
|
||||||
merged.add(current.getId());
|
merged.add(current.getId());
|
||||||
merged.add(other.getId());
|
merged.add(other.getId());
|
||||||
toReturn = true;
|
toReturn = true;
|
||||||
|
|
||||||
|
if (removeRoads) {
|
||||||
|
ArrayList<PlotId> ids = new ArrayList<>();
|
||||||
|
ids.add(current.getId());
|
||||||
|
ids.add(other.getId());
|
||||||
|
this.getManager().finishPlotMerge(this.area, ids);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (removeRoads && toReturn) {
|
|
||||||
ArrayList<PlotId> ids = new ArrayList<>(merged);
|
|
||||||
this.getManager().finishPlotMerge(this.area, ids);
|
|
||||||
}
|
|
||||||
return toReturn;
|
return toReturn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue