summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorandrew <xdotftw@gmail.com>2014-02-20 15:38:37 +0100
committerandrew <xdotftw@gmail.com>2014-02-20 15:38:37 +0100
commitf201f4f176fc908e9ddebfed86d4c8ef5582556c (patch)
tree9cb6601cc1eeeab979c088faa66be52fe27e086e /src/World.cpp
parentManual merge (Fixed conflicts) (diff)
downloadcuberite-f201f4f176fc908e9ddebfed86d4c8ef5582556c.tar
cuberite-f201f4f176fc908e9ddebfed86d4c8ef5582556c.tar.gz
cuberite-f201f4f176fc908e9ddebfed86d4c8ef5582556c.tar.bz2
cuberite-f201f4f176fc908e9ddebfed86d4c8ef5582556c.tar.lz
cuberite-f201f4f176fc908e9ddebfed86d4c8ef5582556c.tar.xz
cuberite-f201f4f176fc908e9ddebfed86d4c8ef5582556c.tar.zst
cuberite-f201f4f176fc908e9ddebfed86d4c8ef5582556c.zip
Diffstat (limited to '')
-rw-r--r--src/World.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/World.cpp b/src/World.cpp
index c1e0731c1..01fdae697 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -12,8 +12,8 @@
#include "Generating/ChunkDesc.h"
#include "OSSupport/Timer.h"
+// Serializers
#include "WorldStorage/ScoreboardSerializer.h"
-#include "WorldStorage/MapSerializer.h"
// Entities (except mobs):
#include "Entities/ExpOrb.h"
@@ -233,6 +233,7 @@ void cWorld::cTickThread::Execute(void)
// cWorld:
cWorld::cWorld(const AString & a_WorldName) :
+ cMapManager(this),
m_WorldName(a_WorldName),
m_IniFileName(m_WorldName + "/world.ini"),
m_StorageSchema("Default"),