Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Handle exceptions from Bukkit on chunk loads - keep from being killed by them...

Browse source
This commit is contained in:
Mike Primm 2012-07-16 00:51:13 -05:00
parent 02eaef3323
commit 419cbb8f1f
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/org/dynmap/bukkit/NewMapChunkCache.java
View file

@ -796,7 +796,15 @@ public class NewMapChunkCache implements MapChunkCache {
} }
chunks_attempted++; chunks_attempted++;
boolean wasLoaded = w.isChunkLoaded(chunk.x, chunk.z); boolean wasLoaded = w.isChunkLoaded(chunk.x, chunk.z);
boolean didload = w.loadChunk(chunk.x, chunk.z, false); boolean didload = false;
try {
didload = w.loadChunk(chunk.x, chunk.z, false);
} catch (Throwable t) { /* Catch chunk error from Bukkit */
Log.warning("Bukkit error loading chunk " + chunk.x + "," + chunk.z + " on " + w.getName());
if(!wasLoaded) { /* If wasn't loaded, we loaded it if it now is */
didload = w.isChunkLoaded(chunk.x, chunk.z);
}
}
boolean didgenerate = false; boolean didgenerate = false;
/* If we didn't load, and we're supposed to generate, do it */ /* If we didn't load, and we're supposed to generate, do it */
if((!didload) && do_generate && vis) if((!didload) && do_generate && vis)