LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch 'master' into 19prep

Browse Source
This commit is contained in:
Aaron Griffith
2011-10-26 15:17:04 -04:00
parent d48d1da493 aa7a837043
commit da92ffb9ca
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
overviewer_core/quadtree.py
View File

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

2
overviewer_core/src/iterate.c
View File

@@ -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; 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 */ /* 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); above_level_data = check_adjacent_blocks(state, x, y, z + 1, state->block);
} /* else above_level_data = 0 */ } /* else above_level_data = 0 */