0

Merge branch 'master' into lighting

Conflicts:
	chunk.py
This commit is contained in:
Aaron Griffith
2010-10-14 15:01:31 -04:00
6 changed files with 246 additions and 131 deletions

View File

@@ -123,6 +123,11 @@ class WorldRenderer(object):
chunklist.append((base36decode(p[1]), base36decode(p[2]),
path))
if not chunklist:
logging.error("No valid chunks specified in your chunklist!")
logging.error("HINT: chunks are in your world directory and have names of the form 'c.*.*.dat'")
sys.exit(1)
# Translate to col, row coordinates
_, _, _, _, chunklist = _convert_coords(chunklist)
@@ -216,8 +221,6 @@ class WorldRenderer(object):
p = f.split(".")
all_chunks.append((base36decode(p[1]), base36decode(p[2]),
os.path.join(dirpath, f)))
logging.debug((base36decode(p[1]), base36decode(p[2]),
os.path.join(dirpath, f)))
if not all_chunks:
logging.error("Error: No chunks found!")