diff options
| author | Mattes D <github@xoft.cz> | 2014-03-25 08:54:13 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-03-25 08:54:13 +0100 |
| commit | c6186acf58d01697d5349edf1b44bde5038daec4 (patch) | |
| tree | 40c5ef7ddec8467bd711d43f5db0262942415d17 /src/WorldStorage/MapSerializer.cpp | |
| parent | Merge pull request #829 from Howaner/Cake (diff) | |
| parent | Minor fixes (diff) | |
| download | cuberite-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 'src/WorldStorage/MapSerializer.cpp')
| -rw-r--r-- | src/WorldStorage/MapSerializer.cpp | 6 |
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"); |