0

Fixed regionlist regression

This commit is contained in:
Andrew Chin
2011-06-18 11:51:13 -04:00
parent b1a386cae9
commit 6cf0cc5147
2 changed files with 6 additions and 5 deletions

View File

@@ -426,9 +426,6 @@ class QuadtreeGen(object):
needs_rerender = False needs_rerender = False
get_region_mtime = world.get_region_mtime get_region_mtime = world.get_region_mtime
for col, row, chunkx, chunky, regionfile in chunks: for col, row, chunkx, chunky, regionfile in chunks:
# don't even check if it's not in the regionlist
if self.world.regionlist and region._filename not in self.world.regionlist:
continue
# bail early if forcerender is set # bail early if forcerender is set
if self.forcerender: if self.forcerender:
@@ -439,7 +436,11 @@ class QuadtreeGen(object):
region,regionMtime = get_region_mtime(regionfile) region,regionMtime = get_region_mtime(regionfile)
if regionMtime <= tile_mtime: if regionMtime <= tile_mtime:
continue continue
# don't even check if it's not in the regionlist
if self.world.regionlist and os.path.abspath(region._filename) not in self.world.regionlist:
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:
needs_rerender = True needs_rerender = True

View File

@@ -78,7 +78,7 @@ class World(object):
logging.info("Scanning regions") logging.info("Scanning regions")
regionfiles = {} regionfiles = {}
self.regions = {} self.regions = {}
self.regionlist = regionlist # a list of paths self.regionlist = map(os.path.abspath, regionlist) # a list of paths
for x, y, regionfile in self._iterate_regionfiles(): for x, y, regionfile in self._iterate_regionfiles():
mcr = self.reload_region(regionfile) mcr = self.reload_region(regionfile)
mcr.get_chunk_info() mcr.get_chunk_info()