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

Revert "Additional check on loaded chunks : avoid getChunkAt rare exception"

Browse source 
This reverts commit 99e43bb65f.
This commit is contained in:
Mike Primm 2013-05-10 17:00:52 -05:00
parent 4f550897ac
commit 042edaac27
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -849,6 +849,7 @@ 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 = false;
boolean isunloadpending = false; boolean isunloadpending = false;
if (queue != null) { if (queue != null) {
isunloadpending = helper.isInUnloadQueue(queue, chunk.x, chunk.z); isunloadpending = helper.isInUnloadQueue(queue, chunk.x, chunk.z);
@ -858,12 +859,18 @@ public class NewMapChunkCache implements MapChunkCache {
} }
try { try {
if (!wasLoaded) { if (!wasLoaded) {
w.loadChunk(chunk.x, chunk.z, false); didload = w.loadChunk(chunk.x, chunk.z, false);
}
else { /* If already was loaded, no need to load */
didload = true;
} }
} catch (Throwable t) { /* Catch chunk error from Bukkit */ } catch (Throwable t) { /* Catch chunk error from Bukkit */
Log.warning("Bukkit error loading chunk " + chunk.x + "," + chunk.z + " on " + w.getName()); 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 didload = w.isChunkLoaded(chunk.x, chunk.z); boolean didgenerate = false;
/* If it did load, make cache of it */ /* If it did load, make cache of it */
if(didload) { if(didload) {
tileData = new DynIntHashMap(); tileData = new DynIntHashMap();
@ -898,7 +905,7 @@ public class NewMapChunkCache implements MapChunkCache {
} }
/* Get tile entity data */ /* Get tile entity data */
List<Object> vals = new ArrayList<Object>(); List<Object> vals = new ArrayList<Object>();
Map<?,?> tileents = helper.getTileEntitiesForChunk(c); Map tileents = helper.getTileEntitiesForChunk(c);
for(Object t : tileents.values()) { for(Object t : tileents.values()) {
int te_x = helper.getTileEntityX(t); int te_x = helper.getTileEntityX(t);
int te_y = helper.getTileEntityY(t); int te_y = helper.getTileEntityY(t);