summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage/MapSerializer.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-03-25 08:54:13 +0100
committerMattes D <github@xoft.cz>2014-03-25 08:54:13 +0100
commitc6186acf58d01697d5349edf1b44bde5038daec4 (patch)
tree40c5ef7ddec8467bd711d43f5db0262942415d17 /src/WorldStorage/MapSerializer.cpp
parentMerge pull request #829 from Howaner/Cake (diff)
parentMinor fixes (diff)
downloadcuberite-c6186acf58d01697d5349edf1b44bde5038daec4.tar
cuberite-c6186acf58d01697d5349edf1b44bde5038daec4.tar.gz
cuberite-c6186acf58d01697d5349edf1b44bde5038daec4.tar.bz2
cuberite-c6186acf58d01697d5349edf1b44bde5038daec4.tar.lz
cuberite-c6186acf58d01697d5349edf1b44bde5038daec4.tar.xz
cuberite-c6186acf58d01697d5349edf1b44bde5038daec4.tar.zst
cuberite-c6186acf58d01697d5349edf1b44bde5038daec4.zip
Diffstat (limited to '')
-rw-r--r--src/WorldStorage/MapSerializer.cpp6
1 files changed, 5 insertions, 1 deletions
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");