summaryrefslogtreecommitdiffstats
path: root/source/ChunkMap.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-02-28 08:42:45 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-02-28 08:42:45 +0100
commit2588f5a605d135bc01996f3a685444dfb37978f8 (patch)
tree4aee764dd164860d546d1e9269c8ee2967810a90 /source/ChunkMap.cpp
parentFixed a copypasta error from rev 1224 (diff)
downloadcuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar.gz
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar.bz2
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar.lz
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar.xz
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar.zst
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.zip
Diffstat (limited to '')
-rw-r--r--source/ChunkMap.cpp25
1 files changed, 21 insertions, 4 deletions
diff --git a/source/ChunkMap.cpp b/source/ChunkMap.cpp
index 5ccdf35ca..824c7cbfe 100644
--- a/source/ChunkMap.cpp
+++ b/source/ChunkMap.cpp
@@ -641,6 +641,23 @@ void cChunkMap::UseBlockEntity(cPlayer * a_Player, int a_BlockX, int a_BlockY, i
+void cChunkMap::WakeUpSimulators(int a_BlockX, int a_BlockY, int a_BlockZ)
+{
+ cCSLock Lock(m_CSLayers);
+ int ChunkX, ChunkZ;
+ cChunkDef::BlockToChunk(a_BlockX, a_BlockY, a_BlockZ, ChunkX, ChunkZ);
+ cChunkPtr Chunk = GetChunkNoGen(ChunkX, 0, ChunkZ);
+ if ((Chunk == NULL) || !Chunk->IsValid())
+ {
+ return;
+ }
+ m_World->GetSimulatorManager()->WakeUp(a_BlockX, a_BlockY, a_BlockZ, Chunk);
+}
+
+
+
+
+
void cChunkMap::MarkChunkDirty (int a_ChunkX, int a_ChunkY, int a_ChunkZ)
{
cCSLock Lock(m_CSLayers);
@@ -1002,6 +1019,7 @@ void cChunkMap::SetBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_B
if ((Chunk != NULL) && Chunk->IsValid())
{
Chunk->SetBlock(X, Y, Z, a_BlockType, a_BlockMeta );
+ m_World->GetSimulatorManager()->WakeUp(a_BlockX, a_BlockY, a_BlockZ, Chunk);
}
}
@@ -1164,10 +1182,9 @@ bool cChunkMap::DigBlock(int a_X, int a_Y, int a_Z)
}
DestChunk->SetBlock(PosX, PosY, PosZ, E_BLOCK_AIR, 0 );
+ m_World->GetSimulatorManager()->WakeUp(a_X, a_Y, a_Z, DestChunk);
}
- m_World->GetSimulatorManager()->WakeUp(a_X, a_Y, a_Z);
-
return true;
}
@@ -1810,7 +1827,7 @@ void cChunkMap::ChunkValidated(void)
-void cChunkMap::CheckBlock(int a_BlockX, int a_BlockY, int a_BlockZ)
+void cChunkMap::QueueTickBlock(int a_BlockX, int a_BlockY, int a_BlockZ)
{
int ChunkX, ChunkZ;
cChunkDef::AbsoluteToRelative(a_BlockX, a_BlockY, a_BlockZ, ChunkX, ChunkZ);
@@ -1820,7 +1837,7 @@ void cChunkMap::CheckBlock(int a_BlockX, int a_BlockY, int a_BlockZ)
cChunkPtr Chunk = GetChunkNoLoad(ChunkX, ZERO_CHUNK_Y, ChunkZ);
if (Chunk != NULL)
{
- Chunk->CheckBlock(a_BlockX, a_BlockY, a_BlockZ);
+ Chunk->QueueTickBlock(a_BlockX, a_BlockY, a_BlockZ);
}
}