diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-04-02 15:05:55 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-04-02 15:05:55 +0200 |
| commit | dcaea749ae502366c23f2c04f3b42882cb71d0d6 (patch) | |
| tree | 56e499098895a03bc66beac5aa33ba4ee261f17e /src/WorldStorage/MapSerializer.cpp | |
| parent | Merge branch 'master' into globals (diff) | |
| parent | Merge pull request #831 from mc-server/Wither (diff) | |
| download | cuberite-dcaea749ae502366c23f2c04f3b42882cb71d0d6.tar cuberite-dcaea749ae502366c23f2c04f3b42882cb71d0d6.tar.gz cuberite-dcaea749ae502366c23f2c04f3b42882cb71d0d6.tar.bz2 cuberite-dcaea749ae502366c23f2c04f3b42882cb71d0d6.tar.lz cuberite-dcaea749ae502366c23f2c04f3b42882cb71d0d6.tar.xz cuberite-dcaea749ae502366c23f2c04f3b42882cb71d0d6.tar.zst cuberite-dcaea749ae502366c23f2c04f3b42882cb71d0d6.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"); |