Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-01-13 03:10:39 +01:00
Code Issues Projects Releases Wiki Activity

More resume fixes

Browse Source
This commit is contained in:
Mike Primm 2022-07-24 15:32:16 -05:00
parent e13a515baf
commit d88ebb0d20
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DynmapCore/src/main/java/org/dynmap/MapManager.java
View File

@ -293,6 +293,7 @@ public class MapManager {
boolean pausedforworld = false; boolean pausedforworld = false;
boolean updaterender = false; boolean updaterender = false;
boolean resume = false; boolean resume = false;
boolean resumeInitDone = false;
boolean quiet = false; boolean quiet = false;
String mapname; String mapname;
AtomicLong total_render_ns = new AtomicLong(0L); AtomicLong total_render_ns = new AtomicLong(0L);
@ -503,7 +504,7 @@ public class MapManager {
return; return;
} }
// If doing resume, load existing tile IDs here (constructor was stupid, and caused timeouts for non-trivial maps - need to check PRs better.... // If doing resume, load existing tile IDs here (constructor was stupid, and caused timeouts for non-trivial maps - need to check PRs better....
if (resume) { // if resume render if (resume && (!resumeInitDone)) { // if resume render AND init not completed
sendMessage(String.format("Scanning map to find existing tiles for resume...")); sendMessage(String.format("Scanning map to find existing tiles for resume..."));
final MapStorage ms = world.getMapStorage(); final MapStorage ms = world.getMapStorage();
ms.enumMapBaseTiles(world, map, new MapStorageBaseTileEnumCB() { ms.enumMapBaseTiles(world, map, new MapStorageBaseTileEnumCB() {
@ -520,7 +521,7 @@ public class MapManager {
} }
}); });
sendMessage(String.format("Scan complete - starting render")); sendMessage(String.format("Scan complete - starting render"));
resume = false; // Only due on first run resumeInitDone = true; // Only due on first run
} }
if(tile0 == null) { /* Not single tile render */ if(tile0 == null) { /* Not single tile render */