AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load block mapping only after all attempts at loading/creating metadataTag

Browse Source
This commit is contained in:
David Vierra 2015-10-09 17:59:15 -10:00
parent feb325232e
commit 9ec45459c7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mceditlib/anvil/adapter.py
View File

@ -527,7 +527,6 @@ class AnvilWorldAdapter(object):
try: try:
metadataTag = nbt.load(buf=self.selectedRevision.readFile("level.dat")) metadataTag = nbt.load(buf=self.selectedRevision.readFile("level.dat"))
self.metadata = AnvilWorldMetadata(metadataTag) self.metadata = AnvilWorldMetadata(metadataTag)
self.loadBlockMapping()
except (EnvironmentError, zlib.error, NBTFormatError) as e: except (EnvironmentError, zlib.error, NBTFormatError) as e:
log.info("Error loading level.dat, trying level.dat_old ({0})".format(e)) log.info("Error loading level.dat, trying level.dat_old ({0})".format(e))
try: try:
@ -543,6 +542,8 @@ class AnvilWorldAdapter(object):
if self.metadata.version != VERSION_ANVIL: if self.metadata.version != VERSION_ANVIL:
raise LevelFormatError("Pre-Anvil world formats are not supported (for now)") raise LevelFormatError("Pre-Anvil world formats are not supported (for now)")
self.loadBlockMapping()
def loadBlockMapping(self): def loadBlockMapping(self):
if self.metadata.is1_8World(): if self.metadata.is1_8World():
itemStackVersion = VERSION_1_8 itemStackVersion = VERSION_1_8