summaryrefslogtreecommitdiffstats
path: root/src/World.h
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.h
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.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/World.h b/src/World.h
index 92fc66c8c..f05ea9b2a 100644
--- a/src/World.h
+++ b/src/World.h
@@ -24,7 +24,7 @@
#include "Entities/ProjectileEntity.h"
#include "ForEachChunkProvider.h"
#include "Scoreboard.h"
-#include "Map.h"
+#include "MapManager.h"
#include "Blocks/WorldInterface.h"
#include "Blocks/BroadcastInterface.h"
@@ -71,7 +71,8 @@ typedef cItemCallback<cMobHeadEntity> cMobHeadBlockCallback;
class cWorld :
public cForEachChunkProvider,
public cWorldInterface,
- public cBroadcastInterface
+ public cBroadcastInterface,
+ public cMapManager
{
public: