summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorZach DeCook <zachdecook@gmail.com>2018-01-03 17:33:31 +0100
committerpeterbell10 <peterbell10@live.co.uk>2018-01-03 17:33:31 +0100
commit68fc28857fce6fdc4ebde6fa8ec4760e4a68e86e (patch)
treeec87e0e5cb3a5fe18b6c4053273589acec67ba41 /src/Entities
parentcLuaState: Update `Push` for entities. (#4128) (diff)
downloadcuberite-68fc28857fce6fdc4ebde6fa8ec4760e4a68e86e.tar
cuberite-68fc28857fce6fdc4ebde6fa8ec4760e4a68e86e.tar.gz
cuberite-68fc28857fce6fdc4ebde6fa8ec4760e4a68e86e.tar.bz2
cuberite-68fc28857fce6fdc4ebde6fa8ec4760e4a68e86e.tar.lz
cuberite-68fc28857fce6fdc4ebde6fa8ec4760e4a68e86e.tar.xz
cuberite-68fc28857fce6fdc4ebde6fa8ec4760e4a68e86e.tar.zst
cuberite-68fc28857fce6fdc4ebde6fa8ec4760e4a68e86e.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/FallingBlock.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/Entities/FallingBlock.cpp b/src/Entities/FallingBlock.cpp
index ae5bbd366..cbbb97202 100644
--- a/src/Entities/FallingBlock.cpp
+++ b/src/Entities/FallingBlock.cpp
@@ -86,6 +86,13 @@ void cFallingBlock::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
Destroy(true);
return;
}
+ else if ((m_BlockType == E_BLOCK_CONCRETE_POWDER) && IsBlockWater(BlockBelow))
+ {
+ // Concrete powder falling into water solidifies on the first water it touches
+ cSandSimulator::FinishFalling(m_World, BlockX, BlockY, BlockZ, E_BLOCK_CONCRETE, m_BlockMeta);
+ Destroy(true);
+ return;
+ }
float MilliDt = a_Dt.count() * 0.001f;
AddSpeedY(MilliDt * -9.8f);