LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch 'devel'

Browse Source
This commit is contained in:
Andrew Brown
2012-03-23 23:19:40 -04:00
parent dc1e3b662b af805d4a4b
commit d7608b0e65
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
overviewer_core/world.py
View File

@@ -281,6 +281,7 @@ class RegionSet(object):
def _get_regionobj(self, regionfilename): def _get_regionobj(self, regionfilename):
# Check the cache first. If it's not there, create the # Check the cache first. If it's not there, create the
# nbt.MCRFileReader object, cache it, and return it # nbt.MCRFileReader object, cache it, and return it
# May raise an nbt.CorruptRegionError
try: try:
return self.regioncache[regionfilename] return self.regioncache[regionfilename]
except KeyError: except KeyError:
@@ -426,7 +427,11 @@ class RegionSet(object):
""" """
for (regionx, regiony), regionfile in self.regionfiles.iteritems(): for (regionx, regiony), regionfile in self.regionfiles.iteritems():
mcr = self._get_regionobj(regionfile) try:
mcr = self._get_regionobj(regionfile)
except nbt.CorruptRegionError:
logging.warning("Found a corrupt region file at %s,%s. Skipping it.", regionx, regiony)
continue
for chunkx, chunky in mcr.get_chunks(): for chunkx, chunky in mcr.get_chunks():
yield chunkx+32*regionx, chunky+32*regiony, mcr.get_chunk_timestamp(chunkx, chunky) yield chunkx+32*regionx, chunky+32*regiony, mcr.get_chunk_timestamp(chunkx, chunky)
@@ -440,7 +445,12 @@ class RegionSet(object):
regionfile = self._get_region_path(x,z) regionfile = self._get_region_path(x,z)
if regionfile is None: if regionfile is None:
return None return None
data = self._get_regionobj(regionfile) try:
data = self._get_regionobj(regionfile)
except nbt.CorruptRegionError:
logging.warning("Ignoring request for chunk %s,%s; region %s,%s seems to be corrupt",
x,z, x//32,z//32)
return None
if data.chunk_exists(x,z): if data.chunk_exists(x,z):
return data.get_chunk_timestamp(x,z) return data.get_chunk_timestamp(x,z)
return None return None