From d4aaa1d1fd5167d6dfdf8979da536e2c3aca52cd Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Fri, 10 May 2013 17:36:27 -0500
Subject: [PATCH] Revert chunk load change - but still make sure they don't
 unload under us

---
 .../org/dynmap/bukkit/NewMapChunkCache.java   | 23 ++-----------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/dynmap/bukkit/NewMapChunkCache.java b/src/main/java/org/dynmap/bukkit/NewMapChunkCache.java
index 75f13b9f..cf8d4b59 100644
--- a/src/main/java/org/dynmap/bukkit/NewMapChunkCache.java
+++ b/src/main/java/org/dynmap/bukkit/NewMapChunkCache.java
@@ -858,34 +858,18 @@ public class NewMapChunkCache implements MapChunkCache {
                 wasLoaded = true;
             }
             try {
-                if (!wasLoaded) {
-                    didload = w.loadChunk(chunk.x, chunk.z, false);
-                }
-                else {  /* If already was loaded, no need to load */
-                    didload = true;
-                }
+                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;
             /* If it did load, make cache of it */
             if(didload) {
                 tileData = new DynIntHashMap();
 
                 Chunk c = w.getChunkAt(chunk.x, chunk.z);   /* Get the chunk */
-                /* Test if chunk isn't populated */
-                boolean populated = true;
-                //TODO: figure out why this doesn't appear to be reliable in Bukkit
-                //if((nmschunk != null) && (doneflag != null)) {
-                //    try {
-                //        populated = doneflag.getBoolean(nmschunk);
-                //    } catch (IllegalArgumentException e) {
-                //    } catch (IllegalAccessException e) {
-                //    }
-                //}
                 if(!vis) {
                     if(hidestyle == HiddenChunkStyle.FILL_STONE_PLAIN)
                         ss = STONE;
@@ -894,9 +878,6 @@ public class NewMapChunkCache implements MapChunkCache {
                     else
                         ss = EMPTY;
                 }
-                else if(!populated) {   /* If not populated, treat as empty */
-                    ss = EMPTY;
-                }
                 else {
                     if(blockdata || highesty) {
                         ss = c.getChunkSnapshot(highesty, biome, biomeraw);
@@ -905,7 +886,7 @@ public class NewMapChunkCache implements MapChunkCache {
                         }
                         /* Get tile entity data */
                         List<Object> vals = new ArrayList<Object>();
-                        Map tileents = helper.getTileEntitiesForChunk(c);
+                        Map<?,?> tileents = helper.getTileEntitiesForChunk(c);
                         for(Object t : tileents.values()) {
                             int te_x = helper.getTileEntityX(t);
                             int te_y = helper.getTileEntityY(t);