Upstream
/
PlotSquared
mirror of https://github.com/IntellectualSites/PlotSquared.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 8d55304242 into c65c9e7827

This commit is contained in:
Phillipp Glanz 2024-05-13 19:20:34 +00:00 committed by GitHub
parent c65c9e7827 8d55304242
commit e5a89ebd15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
View File

@ -245,7 +245,7 @@ public class BlockEventListener implements Listener {
return;
}
Plot plot = area.getPlot(location);
if (plot != null) {
if (plot != null && !plot.isMerging()) {
BukkitPlayer plotPlayer = BukkitUtil.adapt(player);
// == rather than <= as we only care about the "ground level" not being destroyed
if (event.getBlock().getY() == area.getMinGenHeight()) {

26
Core/src/main/java/com/plotsquared/core/plot/Plot.java
View File

@ -1232,6 +1232,32 @@ public class Plot {
return value;
}
/**
* Sets the plot into merging process
*/
public void setMerging() {
for (Plot plot : this.getConnectedPlots()) {
plot.setMeta("merging", true);
}
}
/**
* @return the current state of merging process
*/
public Boolean isMerging() {
Boolean value = (Boolean) this.getMeta("merging");
return value != null && value;
}
/**
* Removes the merging process
*/
public void removeMerging() {
for (Plot plot : this.getConnectedPlots()) {
plot.deleteMeta("merging");
}
}
/**
* Decrement the number of tracked tasks this plot is running<br>
* - Used to track/limit the number of things a player can do on the plot at once

16
Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java
View File

@ -591,6 +591,8 @@ public final class PlotModificationManager {
Plot other = current.getRelative(Direction.NORTH);
if (other != null && other.isOwner(uuid) && (other.getBasePlot(false).equals(current.getBasePlot(false))
|| (plots = other.getConnectedPlots()).size() <= max && frontier.addAll(plots) && (max -= plots.size()) != -1)) {
current.setMerging();
other.setMerging();
current.mergePlot(other, removeRoads, queue);
merged.add(current.getId());
merged.add(other.getId());
@ -602,12 +604,16 @@ public final class PlotModificationManager {
ids.add(other.getId());
this.plot.getManager().finishPlotMerge(ids, queue);
}
current.removeMerging();
other.removeMerging();
}
}
if (max >= 0 && (dir == Direction.ALL || dir == Direction.EAST) && !current.isMerged(Direction.EAST)) {
Plot other = current.getRelative(Direction.EAST);
if (other != null && other.isOwner(uuid) && (other.getBasePlot(false).equals(current.getBasePlot(false))
|| (plots = other.getConnectedPlots()).size() <= max && frontier.addAll(plots) && (max -= plots.size()) != -1)) {
current.setMerging();
other.setMerging();
current.mergePlot(other, removeRoads, queue);
merged.add(current.getId());
merged.add(other.getId());
@ -619,12 +625,16 @@ public final class PlotModificationManager {
ids.add(other.getId());
this.plot.getManager().finishPlotMerge(ids, queue);
}
current.removeMerging();
other.removeMerging();
}
}
if (max >= 0 && (dir == Direction.ALL || dir == Direction.SOUTH) && !current.isMerged(Direction.SOUTH)) {
Plot other = current.getRelative(Direction.SOUTH);
if (other != null && other.isOwner(uuid) && (other.getBasePlot(false).equals(current.getBasePlot(false))
|| (plots = other.getConnectedPlots()).size() <= max && frontier.addAll(plots) && (max -= plots.size()) != -1)) {
current.setMerging();
other.setMerging();
current.mergePlot(other, removeRoads, queue);
merged.add(current.getId());
merged.add(other.getId());
@ -636,12 +646,16 @@ public final class PlotModificationManager {
ids.add(other.getId());
this.plot.getManager().finishPlotMerge(ids, queue);
}
current.removeMerging();
other.removeMerging();
}
}
if (max >= 0 && (dir == Direction.ALL || dir == Direction.WEST) && !current.isMerged(Direction.WEST)) {
Plot other = current.getRelative(Direction.WEST);
if (other != null && other.isOwner(uuid) && (other.getBasePlot(false).equals(current.getBasePlot(false))
|| (plots = other.getConnectedPlots()).size() <= max && frontier.addAll(plots) && (max -= plots.size()) != -1)) {
current.setMerging();
other.setMerging();
current.mergePlot(other, removeRoads, queue);
merged.add(current.getId());
merged.add(other.getId());
@ -653,6 +667,8 @@ public final class PlotModificationManager {
ids.add(other.getId());
this.plot.getManager().finishPlotMerge(ids, queue);
}
current.removeMerging();
other.removeMerging();
}
}
}