zhangyuheng/BlueMap
1
0
Fork 0
forked from mirror/BlueMap
Code Pull Requests Activity

Final fix for occasional crash

Browse Source 
<Comparison method violates its general contract>
This commit is contained in:
Blue (Lukas Rieger) 2021-06-16 01:06:23 +02:00
parent 5cdadbd7e2
commit d3fe328d8e
No known key found for this signature in database
GPG Key ID: 904C4995F9E1F800
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/rendermanager/WorldRegionRenderTask.java
View File

@ -25,6 +25,7 @@
package de.bluecolored.bluemap.common.rendermanager; package de.bluecolored.bluemap.common.rendermanager;
import com.flowpowered.math.vector.Vector2i; import com.flowpowered.math.vector.Vector2i;
import com.flowpowered.math.vector.Vector2l;
import de.bluecolored.bluemap.core.map.BmMap; import de.bluecolored.bluemap.core.map.BmMap;
import de.bluecolored.bluemap.core.world.Grid; import de.bluecolored.bluemap.core.world.Grid;
import de.bluecolored.bluemap.core.world.Region; import de.bluecolored.bluemap.core.world.Region;
@ -63,7 +64,7 @@ public WorldRegionRenderTask(BmMap map, Vector2i worldRegion, boolean force) {
} }
private synchronized void init() { private synchronized void init() {
Set<Vector2i> tileSet = new HashSet<>(); Set<Vector2l> tileSet = new HashSet<>();
startTime = System.currentTimeMillis(); startTime = System.currentTimeMillis();
//Logger.global.logInfo("Starting: " + worldRegion); //Logger.global.logInfo("Starting: " + worldRegion);
@ -83,14 +84,15 @@ private synchronized void init() {
for (int x = tileMin.getX(); x <= tileMax.getX(); x++) { for (int x = tileMin.getX(); x <= tileMax.getX(); x++) {
for (int z = tileMin.getY(); z <= tileMax.getY(); z++) { for (int z = tileMin.getY(); z <= tileMax.getY(); z++) {
tileSet.add(new Vector2i(x, z)); tileSet.add(new Vector2l(x, z));
} }
} }
} }
this.tileCount = tileSet.size(); this.tileCount = tileSet.size();
this.tiles = tileSet.stream() this.tiles = tileSet.stream()
.sorted() .sorted(WorldRegionRenderTask::compareVec2L) //sort with longs to avoid overflow (comparison uses distanceSquared)
.map(Vector2l::toInt) // back to ints
.collect(Collectors.toCollection(ArrayDeque::new)); .collect(Collectors.toCollection(ArrayDeque::new));
if (tiles.isEmpty()) complete(); if (tiles.isEmpty()) complete();
@ -184,10 +186,18 @@ public int hashCode() {
public static Comparator<WorldRegionRenderTask> defaultComparator(final Vector2i centerRegion) { public static Comparator<WorldRegionRenderTask> defaultComparator(final Vector2i centerRegion) {
return (task1, task2) -> { return (task1, task2) -> {
Vector2i task1Rel = task1.worldRegion.sub(centerRegion); // use long to compare to avoid overflow (comparison uses distanceSquared)
Vector2i task2Rel = task2.worldRegion.sub(centerRegion); Vector2l task1Rel = new Vector2l(task1.worldRegion.getX() - centerRegion.getX(), task1.worldRegion.getY() - centerRegion.getY());
return task1Rel.compareTo(task2Rel); Vector2l task2Rel = new Vector2l(task2.worldRegion.getX() - centerRegion.getX(), task2.worldRegion.getY() - centerRegion.getY());
return compareVec2L(task1Rel, task2Rel);
}; };
} }
/**
* Comparison method that doesn't overflow that easily
*/
private static int compareVec2L(Vector2l v1, Vector2l v2) {
return Long.signum(v1.lengthSquared() - v2.lengthSquared());
}
} }