Merge branch 'master' into smooth-lighting

overviewer_core/data/web_assets/overviewer.js

@@ -266,6 +266,9 @@ var overviewer = {
             google.maps.event.addListener(overviewer.map, 'zoom_changed', function() {
                 overviewer.util.updateHash();
             });
+            google.maps.event.addListener(overviewer.map, 'dblclick', function() {
+                overviewer.util.updateHash();
+            });
             
             // Make the link again whenever the map changes
             google.maps.event.addListener(overviewer.map, 'maptypeid_changed', function() {

overviewer_core/quadtree.py

@@ -439,9 +439,12 @@ class QuadtreeGen(object):
                     needs_rerender = True
                     break
                 
-                # check region file mtime first. 
-                if regionMtime <= tile_mtime:
-                    continue
+                # check region file mtime first.
+                # on windows (and possibly elsewhere) minecraft won't update
+                # the region file mtime until after shutdown.
+                # for servers this is unacceptable, so skip this check.
+                #if regionMtime <= tile_mtime:
+                #    continue
                
                 # checking chunk mtime
                 if region.get_chunk_timestamp(chunkx, chunky) > tile_mtime:

overviewer_core/src/iterate.c

@@ -193,7 +193,7 @@ generate_pseudo_data(RenderState *state, unsigned char ancilData) {
         unsigned char above_level_data = 0, same_level_data = 0, below_level_data = 0, possibly_connected = 0, final_data = 0;
 
         /* check for air in z+1, no air = no connection with upper level */        
-        if ((z != 127) && (getArrayByte3D(state->left_blocks, x, y, z) == 0)) { 
+        if ((z != 127) && (getArrayByte3D(state->blocks, x, y, z + 1) == 0)) { 
             above_level_data = check_adjacent_blocks(state, x, y, z + 1, state->block);
         }   /* else above_level_data = 0 */
         

overviewer_core/textures.py

@@ -2255,7 +2255,7 @@ def prepareBiomeData(worlddir):
         try:
             grasscolor = list(Image.open(os.path.join(biomeDir,"grasscolor.png")).getdata())
             foliagecolor = list(Image.open(os.path.join(biomeDir,"foliagecolor.png")).getdata())
-        except:
+        except Exception:
             # clear anything that managed to get set
             grasscolor = None
             foliagecolor = None
@@ -2316,7 +2316,7 @@ def loadLightColor():
         lightcolor_checked = True
         try:
             lightcolor = list(_load_image("light_normal.png").getdata())
-        except:
+        except Exception:
             logging.warning("Light color image could not be found.")
             lightcolor = None
     return lightcolor

overviewer_core/util.py

@@ -52,7 +52,7 @@ def findGitHash():
         try:
             import overviewer_version
             return overviewer_version.HASH
-        except:
+        except Exception:
             return "unknown"
 
 def findGitVersion():
@@ -68,9 +68,9 @@ def findGitVersion():
         # and 0.1.3 into 0.1.3
         line = '-'.join(line.split('-', 2)[:2])
         return line.strip()
-    except:
+    except Exception:
         try:
             import overviewer_version
             return overviewer_version.VERSION
-        except:
+        except Exception:
             return "unknown"