summaryrefslogtreecommitdiffstats
path: root/src/ChunkMap.h
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2016-04-24 16:29:21 +0200
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-04-24 16:29:21 +0200
commit6553d696ee8cf3020cba1027f2da8b4d94d0f839 (patch)
tree0af46519d4cf5b46042a6e066e3ef434d99bfdb6 /src/ChunkMap.h
parentMerge pull request #3160 from LogicParrot/clientHandleThread (diff)
parentChunkLayers now stored in std::map (diff)
downloadcuberite-6553d696ee8cf3020cba1027f2da8b4d94d0f839.tar
cuberite-6553d696ee8cf3020cba1027f2da8b4d94d0f839.tar.gz
cuberite-6553d696ee8cf3020cba1027f2da8b4d94d0f839.tar.bz2
cuberite-6553d696ee8cf3020cba1027f2da8b4d94d0f839.tar.lz
cuberite-6553d696ee8cf3020cba1027f2da8b4d94d0f839.tar.xz
cuberite-6553d696ee8cf3020cba1027f2da8b4d94d0f839.tar.zst
cuberite-6553d696ee8cf3020cba1027f2da8b4d94d0f839.zip
Diffstat (limited to '')
-rw-r--r--src/ChunkMap.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ChunkMap.h b/src/ChunkMap.h
index 4f49572c6..8df76bde6 100644
--- a/src/ChunkMap.h
+++ b/src/ChunkMap.h
@@ -12,7 +12,6 @@
-
class cWorld;
class cWorldInterface;
class cItem;
@@ -68,7 +67,6 @@ public:
static const int LAYER_SIZE = 32;
cChunkMap(cWorld * a_World);
- ~cChunkMap();
// Broadcast respective packets to all clients of the chunk where the event is taking place
// (Please keep these alpha-sorted)
@@ -424,6 +422,8 @@ private:
);
~cChunkLayer();
+ cChunkLayer(const cChunkLayer & a_That) = delete;
+
/** Always returns an assigned chunkptr, but the chunk needn't be valid (loaded / generated) - callers must check */
cChunkPtr GetChunk( int a_ChunkX, int a_ChunkZ);
@@ -506,7 +506,7 @@ private:
void RemoveLayer(cChunkLayer * a_Layer);
cCriticalSection m_CSLayers;
- cChunkLayerList m_Layers;
+ std::map<std::pair<int, int>, cChunkLayer> m_Layers;
cEvent m_evtChunkValid; // Set whenever any chunk becomes valid, via ChunkValidated()
cWorld * m_World;