From 9ec45459c73215afbc8dd4ecf676a25e3e7afc0f Mon Sep 17 00:00:00 2001
From: David Vierra <codewarrior@hawaii.rr.com>
Date: Fri, 9 Oct 2015 17:59:15 -1000
Subject: [PATCH] Load block mapping only after all attempts at
 loading/creating metadataTag

---
 src/mceditlib/anvil/adapter.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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