Skip to content

fix: regenallroads logging, cancellation, correct equality check #4857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NotMyFault merged 1 commit into from
May 23, 2026
Merged

fix: regenallroads logging, cancellation, correct equality check #4857

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 74 additions & 20 deletions Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,9 +436,19 @@ public void run() {
while (iter.hasNext()) {
BlockVector2 chunk = iter.next();
iter.remove();
boolean regenedRoad = regenerateRoad(area, chunk, extend, queue);
if (!regenedRoad) {
LOGGER.info("Failed to regenerate roads in chunk {}", chunk);
RoadRegenerateResult result = regenerateRoad(area, chunk, extend, queue);
if (result != RoadRegenerateResult.SUCCESS) {
LOGGER.info(
"Failed to regenerate roads in chunk {}: {}", chunk,
result.getMessage()
);
if (result.irrecoverable()) {
LOGGER.error("Cancelling road regen");
chunks.clear();
queue.cancel();
HybridUtils.regions.clear();
return;
}
}
}
queue.enqueue();
Expand Down Expand Up @@ -479,9 +489,20 @@ public void run() {
for (int i = 0; i < 32; i++) {
final BlockVector2 chunk = iterator.next();
iterator.remove();
boolean regenedRoads = regenerateRoad(area, chunk, extend, queue);
if (!regenedRoads) {
LOGGER.info("Failed to regenerate the road in chunk {}", chunk);
RoadRegenerateResult result = regenerateRoad(area, chunk, extend, queue);
if (result != RoadRegenerateResult.SUCCESS) {
LOGGER.info(
"Failed to regenerate the road in chunk {}: {}", chunk,
result.getMessage()
);
if (result.irrecoverable()) {
LOGGER.error("Cancelling road regen");
chunks.clear();
queue.cancel();
HybridUtils.regions.clear();
TaskManager.runTaskLater(task, TaskTime.seconds(1L));
return null;
}
}
}
queue.setCompleteTask(task);
Expand All @@ -493,9 +514,20 @@ public void run() {
while (!chunks.isEmpty()) {
final BlockVector2 chunk = iterator.next();
iterator.remove();
boolean regenedRoads = regenerateRoad(area, chunk, extend, queue);
if (!regenedRoads) {
LOGGER.info("Failed to regenerate road in chunk {}", chunk);
RoadRegenerateResult result = regenerateRoad(area, chunk, extend, queue);
if (result != RoadRegenerateResult.SUCCESS) {
LOGGER.info(
"Failed to regenerate road in chunk {}: {}", chunk,
result.getMessage()
);
if (result.irrecoverable()) {
LOGGER.error("Cancelling road regen");
chunks.clear();
queue.cancel();
HybridUtils.regions.clear();
TaskManager.runTaskLater(task, TaskTime.seconds(1L));
return null;
}
}
}
queue.setCompleteTask(task);
Expand Down Expand Up @@ -592,10 +624,10 @@ private int get_ey(final HybridPlotWorld hpw, QueueCoordinator queue, int sx, in
* @param chunk Chunk location to regenerate
* @param extend How far to extend setting air above the road
* @param queueCoordinator {@link QueueCoordinator} to use to set the blocks. Null if one should be created and enqueued
* @return if successful
* @return {@link RoadRegenerateResult} result
* @since 6.6.0
*/
public boolean regenerateRoad(
public RoadRegenerateResult regenerateRoad(
final PlotArea area,
final BlockVector2 chunk,
int extend,
Expand All @@ -607,14 +639,14 @@ public boolean regenerateRoad(
int ez = z + 15;
HybridPlotWorld plotWorld = (HybridPlotWorld) area;
if (!plotWorld.ROAD_SCHEMATIC_ENABLED) {
return false;
return RoadRegenerateResult.FAIL_ROAD_SCHEMATICS_NOT_ENABLED;
}
AtomicBoolean toCheck = new AtomicBoolean(false);
if (plotWorld.getType() == PlotAreaType.PARTIAL) {
boolean chunk1 = area.contains(x, z);
boolean chunk2 = area.contains(ex, ez);
if (!chunk1 && !chunk2) {
return false;
return RoadRegenerateResult.SUCCESS;
} else {
toCheck.set(chunk1 ^ chunk2);
}
Expand All @@ -624,18 +656,18 @@ public boolean regenerateRoad(
PlotId id2 = manager.getPlotId(ex, 0, ez);
x = x - plotWorld.ROAD_OFFSET_X;
z -= plotWorld.ROAD_OFFSET_Z;
final int finalX = x;
final int finalZ = z;
final boolean enqueue;
final QueueCoordinator queue;
int finalX = x;
int finalZ = z;
boolean enqueue;
QueueCoordinator queue;
if (queueCoordinator == null) {
queue = this.blockQueue.getNewQueue(worldUtil.getWeWorld(plotWorld.getWorldName()));
enqueue = true;
} else {
queue = queueCoordinator;
enqueue = false;
}
if (id1 == null || id2 == null || id1 != id2) {
if (id1 == null || !id1.equals(id2)) {
if (id1 != null) {
Plot p1 = area.getPlotAbs(id1);
if (p1 != null && p1.hasOwner() && p1.isMerged()) {
Expand Down Expand Up @@ -720,9 +752,31 @@ public boolean regenerateRoad(
if (enqueue) {
queue.enqueue();
}
return true;
}
return false;
return RoadRegenerateResult.SUCCESS;
}

public enum RoadRegenerateResult {

SUCCESS(true, null),
FAIL_ROAD_SCHEMATICS_NOT_ENABLED(false, "Plot world does not have road schematics enabled - are they correctly set up?");

private final boolean recoverable;
private final String message;

RoadRegenerateResult(boolean recoverable, String message) {
this.recoverable = recoverable;
this.message = message;
}

public boolean irrecoverable() {
return !recoverable;
}

public String getMessage() {
return message;
}

}

}
Loading