LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote-tracking branch 'CounterPillow/corrupt-region-warning'

Browse Source
This commit is contained in:
Aaron Griffith
2016-06-10 20:22:40 -04:00
parent 5665beb43f 7dcf40fc20
commit 5571f4eb54
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
overviewer_core/world.py
View File

@@ -360,6 +360,7 @@ class RegionSet(object):
time.sleep(0.5)
continue
else:
logging.warning("The following was encountered while reading from %s:", self.regiondir)
if isinstance(e, nbt.CorruptRegionError):
logging.warning("Tried several times to read chunk %d,%d. Its region (%d,%d) may be corrupt. Giving up.",
x, z,x//32,z//32)
@@ -467,7 +468,7 @@ class RegionSet(object):
try:
mcr = self._get_regionobj(regionfile)
except nbt.CorruptRegionError:
logging.warning("Found a corrupt region file at %s,%s. Skipping it.", regionx, regiony)
logging.warning("Found a corrupt region file at %s,%s in %s, Skipping it.", regionx, regiony, self.regiondir)
continue
for chunkx, chunky in mcr.get_chunks():
yield chunkx+32*regionx, chunky+32*regiony, mcr.get_chunk_timestamp(chunkx, chunky)
@@ -487,7 +488,7 @@ class RegionSet(object):
try:
mcr = self._get_regionobj(regionfile)
except nbt.CorruptRegionError:
logging.warning("Found a corrupt region file at %s,%s. Skipping it.", regionx, regiony)
logging.warning("Found a corrupt region file at %s,%s in %s, Skipping it.", regionx, regiony, self.regiondir)
continue
for chunkx, chunky in mcr.get_chunks():