LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote-tracking branch 'yoplitein/master' into mystcraft

Browse Source 
Conflicts:
	overviewer_core/aux_files/genPOI.py
This commit is contained in:
Aaron Griffith
2013-12-01 15:56:56 -05:00
parent 41d63c3781 366e6db8e3
commit aecbf28faf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
overviewer_core/aux_files/genPOI.py
View File

@@ -58,15 +58,17 @@ def handlePlayers(rset, render, worldpath):
# only handle this region set once # only handle this region set once
if 'Players' in rset._pois: if 'Players' in rset._pois:
return return
dimension = None
try: try:
dimension = {None: 0, dimension = {None: 0,
'DIM-1': -1, 'DIM-1': -1,
'DIM1': 1}[rset.get_type()] 'DIM1': 1}[rset.get_type()]
except KeyError, e: except KeyError, e:
mystdim = re.match(r"^DIM_MYST(\d+)$", str(e)) # Dirty hack. Woo! mystdim = re.match(r"^DIM_MYST(\d+)$", e.message) # Dirty hack. Woo!
if mystdim: if mystdim:
dimension = int(mystdim.group(1)) dimension = int(mystdim.group(1))
else:
raise
playerdir = os.path.join(worldpath, "players") playerdir = os.path.join(worldpath, "players")
if os.path.isdir(playerdir): if os.path.isdir(playerdir):
playerfiles = os.listdir(playerdir) playerfiles = os.listdir(playerdir)