summaryrefslogtreecommitdiffstats
path: root/source/cChunkMap.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-04-10 13:22:11 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-04-10 13:22:11 +0200
commitc51a4b9469fee0314d1b849206d1cf1c7c1240e4 (patch)
tree655d6a392b5483eea1453a08c24e269f8ae68d09 /source/cChunkMap.cpp
parentCompression error -5 fix (diff)
downloadcuberite-c51a4b9469fee0314d1b849206d1cf1c7c1240e4.tar
cuberite-c51a4b9469fee0314d1b849206d1cf1c7c1240e4.tar.gz
cuberite-c51a4b9469fee0314d1b849206d1cf1c7c1240e4.tar.bz2
cuberite-c51a4b9469fee0314d1b849206d1cf1c7c1240e4.tar.lz
cuberite-c51a4b9469fee0314d1b849206d1cf1c7c1240e4.tar.xz
cuberite-c51a4b9469fee0314d1b849206d1cf1c7c1240e4.tar.zst
cuberite-c51a4b9469fee0314d1b849206d1cf1c7c1240e4.zip
Diffstat (limited to 'source/cChunkMap.cpp')
-rw-r--r--source/cChunkMap.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/source/cChunkMap.cpp b/source/cChunkMap.cpp
index e01899f28..58cdd6f07 100644
--- a/source/cChunkMap.cpp
+++ b/source/cChunkMap.cpp
@@ -897,6 +897,22 @@ void cChunkMap::ChunksStay(const cChunkCoordsList & a_Chunks, bool a_Stay)
+void cChunkMap::MarkChunkRegenerating(int a_ChunkX, int a_ChunkZ)
+{
+ cCSLock Lock(m_CSLayers);
+ cChunkPtr Chunk = GetChunkNoLoad(a_ChunkX, ZERO_CHUNK_Y, a_ChunkZ);
+ if (Chunk == NULL)
+ {
+ // Not present
+ return;
+ }
+ Chunk->MarkRegenerating();
+}
+
+
+
+
+
void cChunkMap::Tick( float a_Dt, MTRand & a_TickRandom )
{
cCSLock Lock(m_CSLayers);
@@ -971,7 +987,6 @@ cChunkPtr cChunkMap::cChunkLayer::GetChunk( int a_ChunkX, int a_ChunkY, int a_Ch
const int LocalX = a_ChunkX - m_LayerX * LAYER_SIZE;
const int LocalZ = a_ChunkZ - m_LayerZ * LAYER_SIZE;
-
if (!((LocalX < LAYER_SIZE) && (LocalZ < LAYER_SIZE) && (LocalX > -1) && (LocalZ > -1)))
{
ASSERT(!"Asking a cChunkLayer for a chunk that doesn't belong to it!");