LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge pull request #434 from Xon/master

Browse Source 
Permit overviewer to keep running even if the chunk the spawn is in is corrupt.
This commit is contained in:
Aaron Griffith
2011-07-15 10:44:30 -07:00
parent f7015396ab c5ba5edbcc
commit 546fe5c39e
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
overviewer_core/world.py
View File

@@ -209,25 +209,27 @@ class World(object):
chunkX = spawnX/16 chunkX = spawnX/16
chunkY = spawnZ/16 chunkY = spawnZ/16
## The filename of this chunk try:
chunkFile = self.get_region_path(chunkX, chunkY) ## The filename of this chunk
chunkFile = self.get_region_path(chunkX, chunkY)
if chunkFile is not None: if chunkFile is not None:
data = nbt.load_from_region(chunkFile, chunkX, chunkY)[1] data = nbt.load_from_region(chunkFile, chunkX, chunkY)[1]
if data is not None: if data is not None:
level = data['Level'] level = data['Level']
blockArray = numpy.frombuffer(level['Blocks'], dtype=numpy.uint8).reshape((16,16,128)) blockArray = numpy.frombuffer(level['Blocks'], dtype=numpy.uint8).reshape((16,16,128))
## The block for spawn *within* the chunk ## The block for spawn *within* the chunk
inChunkX = spawnX - (chunkX*16) inChunkX = spawnX - (chunkX*16)
inChunkZ = spawnZ - (chunkY*16) inChunkZ = spawnZ - (chunkY*16)
## find the first air block ## find the first air block
while (blockArray[inChunkX, inChunkZ, spawnY] != 0): while (blockArray[inChunkX, inChunkZ, spawnY] != 0):
spawnY += 1 spawnY += 1
if spawnY == 128: if spawnY == 128:
break break
except ChunkCorrupt:
#ignore corrupt spawn, and continue
pass
self.POI.append( dict(x=spawnX, y=spawnY, z=spawnZ, self.POI.append( dict(x=spawnX, y=spawnY, z=spawnZ,
msg="Spawn", type="spawn", chunk=(chunkX, chunkY))) msg="Spawn", type="spawn", chunk=(chunkX, chunkY)))
self.spawn = (spawnX, spawnY, spawnZ) self.spawn = (spawnX, spawnY, spawnZ)