LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch 'master' of github.com:overviewer/Minecraft-Overviewer

Browse Source 
Conflicts:
	overviewer_core/world.py
This commit is contained in:
Andrew Brown
2012-03-02 19:19:27 -05:00
parent cfddfc468f 3007099c44
commit 7afd862704
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overviewer_core/util.py
View File

@@ -62,7 +62,7 @@ def findGitHash():
def findGitVersion(): def findGitVersion():
try: try:
p = Popen(['git', 'describe', '--tags'], stdout=PIPE, stderr=PIPE, shell=True) p = Popen('git describe --tags', stdout=PIPE, stderr=PIPE, shell=True)
p.stderr.close() p.stderr.close()
line = p.stdout.readlines()[0] line = p.stdout.readlines()[0]
if line.startswith('release-'): if line.startswith('release-'):

5
overviewer_core/world.py
View File

@@ -79,7 +79,10 @@ class World(object):
# if not mcregion, error out early # if not mcregion, error out early
data = nbt.load(os.path.join(self.worlddir, "level.dat"))[1]['Data'] data = nbt.load(os.path.join(self.worlddir, "level.dat"))[1]['Data']
if not ('version' in data and data['version'] == 19132): if not ('version' in data and data['version'] == 19132):
logging.error("Sorry, This version of Minecraft-Overviewer only works with the old McRegion format. You will need to upgrade to render Minecraft 1.2 ('Anvil') worlds") logging.error("Sorry, This version of Minecraft-Overviewer only works with McRegion format")
if ('version' in data and data['version'] == 19133):
logging.error("You will need to upgrade to render Minecraft 1.2 ('Anvil') worlds")
logging.error("Please see http://overviewer.org/blog/2012/03/01/anvil-support/")
sys.exit(1) sys.exit(1)
if 'LevelName' in data: if 'LevelName' in data:
# level.dat should have the LevelName attribute so we'll use that # level.dat should have the LevelName attribute so we'll use that