Skip to content

Fix lowres changes getting lost when a tile is changed while it is saved #883

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

Closed
Hexay wants to merge 1 commit into from
Closed

Fix lowres changes getting lost when a tile is changed while it is saved #883

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
34 changes: 21 additions & 13 deletions core/src/main/java/de/bluecolored/bluemap/core/map/lowres/LowresLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand Down Expand Up @@ -102,7 +103,17 @@ public void removeTileUpdateListener(BiConsumer<Vector2i, Integer> listener) {
}

public synchronized void save() {
pendingChanges.entrySet().removeIf(entry -> saveTile(entry.getKey(), entry.getValue()));
Map<Vector2i, LowresTile> failed = new HashMap<>();
for (Map.Entry<Vector2i, LowresTile> entry : pendingChanges.entrySet()) {
Vector2i tilePos = entry.getKey();
LowresTile tile = entry.getValue();

// remove before saving, so changes that are made while saving mark the tile as pending again
if (!pendingChanges.remove(tilePos, tile)) continue;
if (!saveTile(tilePos, tile)) failed.put(tilePos, tile);
}
failed.forEach(pendingChanges::putIfAbsent);

if (pendingChanges.size() >= DISCARD_THRESHOLD) {
Logger.global.logDebug("Discarding changes of " + pendingChanges.size() + " lowres-tiles that failed to save!");
pendingChanges.clear();
Expand Down Expand Up @@ -196,34 +207,31 @@ private boolean saveTile(Vector2i tilePos, LowresTile tile) {
return true;
}

private LowresTile accessTile(int x, int z) {
Vector2i tilePos = VECTOR_2_I_CACHE.get(x, z);
private void setPixel(int cellX, int cellZ, int pixelX, int pixelZ, Color color, int height, int blockLight) {
Vector2i tilePos = VECTOR_2_I_CACHE.get(cellX, cellZ);
LowresTile tile = tileCache.get(tilePos);

tile.set(pixelX, pixelZ, color, height, blockLight);

// mark as pending after the change, so a concurrent save can not miss it
if (pendingChanges.size() >= MAX_PENDING) save();
pendingChanges.put(tilePos, tile);

return tile;
}

void set(int cellX, int cellZ, int pixelX, int pixelZ, Color color, int height, int blockLight) {
accessTile(cellX, cellZ)
.set(pixelX, pixelZ, color, height, blockLight);
setPixel(cellX, cellZ, pixelX, pixelZ, color, height, blockLight);

// for seamless edges
if (pixelX == 0) {
accessTile(cellX - 1, cellZ)
.set(tileGrid.getGridSize().getX(), pixelZ, color, height, blockLight);
setPixel(cellX - 1, cellZ, tileGrid.getGridSize().getX(), pixelZ, color, height, blockLight);
}

if (pixelZ == 0) {
accessTile(cellX, cellZ - 1)
.set(pixelX, tileGrid.getGridSize().getY(), color, height, blockLight);
setPixel(cellX, cellZ - 1, pixelX, tileGrid.getGridSize().getY(), color, height, blockLight);
}

if (pixelX == 0 && pixelZ == 0) {
accessTile(cellX - 1, cellZ - 1)
.set(tileGrid.getGridSize().getX(), tileGrid.getGridSize().getY(), color, height, blockLight);
setPixel(cellX - 1, cellZ - 1, tileGrid.getGridSize().getX(), tileGrid.getGridSize().getY(), color, height, blockLight);
}
}

Expand Down