From 6b77dc74ade3d8088da09d26c1b701d92ef28e9e Mon Sep 17 00:00:00 2001
From: andrew <xdotftw@gmail.com>
Date: Mon, 24 Mar 2014 12:29:19 +0200
Subject: Wither invulnerability

---
 src/WorldStorage/MapSerializer.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/WorldStorage/MapSerializer.cpp')

diff --git a/src/WorldStorage/MapSerializer.cpp b/src/WorldStorage/MapSerializer.cpp
index a4a0aab57..df72d1cc9 100644
--- a/src/WorldStorage/MapSerializer.cpp
+++ b/src/WorldStorage/MapSerializer.cpp
@@ -141,7 +141,11 @@ bool cMapSerializer::LoadMapFromNBT(const cParsedNBT & a_NBT)
 	{
 		eDimension Dimension = (eDimension) a_NBT.GetByte(CurrLine);
 		
-		ASSERT(Dimension == m_Map->m_World->GetDimension());
+		if (Dimension != m_Map->m_World->GetDimension())
+		{
+			// TODO 2014-03-20 xdot: We should store nether maps in nether worlds, e.t.c.
+			return false;
+		}
 	}
 
 	CurrLine = a_NBT.FindChildByName(Data, "width");
-- 
cgit v1.2.3