LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Don't error out when encountering an unknown RegionSet

Browse Source
This commit is contained in:
Andrew Chin
2012-11-26 00:51:14 -05:00
parent 36afaa3b5e
commit 126192514f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
overviewer_core/world.py
View File

@@ -122,6 +122,7 @@ class World(object):
if mcas: if mcas:
# construct a regionset object for this # construct a regionset object for this
rset = RegionSet(root) rset = RegionSet(root)
if not rset.is_valid(): continue
if root == os.path.join(self.worlddir, "region"): if root == os.path.join(self.worlddir, "region"):
self.regionsets.insert(0, rset) self.regionsets.insert(0, rset)
else: else:
@@ -270,6 +271,15 @@ class RegionSet(object):
def __repr__(self): def __repr__(self):
return "<RegionSet regiondir=%r>" % self.regiondir return "<RegionSet regiondir=%r>" % self.regiondir
def is_valid(self):
"""If this region set isn't one of the three known regions, then
return False"""
try:
self.get_type()
return True
except Exception:
return False
def get_type(self): def get_type(self):
"""Attempts to return a string describing the dimension represented by """Attempts to return a string describing the dimension represented by
this regionset. Either "nether", "end" or "overworld" this regionset. Either "nether", "end" or "overworld"