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

Fix issue with plot border during merge

Browse Source 
* `getExtendedTopAbs()` used wrong relative plot for calculating X position.
* Not running `finishPlotMerge()` after every merge led to broken roads during a `merge all`
This commit is contained in:
Alexander Krivács Schrøder 2019-05-29 14:49:27 +02:00 committed by Matt
parent 95cb0d84f0
commit 41299e6851
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
View File

@ -1669,7 +1669,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;
} }
@ -2243,6 +2243,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)) {
@ -2255,6 +2262,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)) {
@ -2267,6 +2281,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)) {
@ -2279,13 +2300,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;
} }