summaryrefslogtreecommitdiffstats
path: root/src/Simulator
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/Simulator
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 'src/Simulator')
-rw-r--r--src/Simulator/SandSimulator.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Simulator/SandSimulator.cpp b/src/Simulator/SandSimulator.cpp
index 01e699b49..d10523c61 100644
--- a/src/Simulator/SandSimulator.cpp
+++ b/src/Simulator/SandSimulator.cpp
@@ -319,6 +319,11 @@ void cSandSimulator::DoInstantFall(cChunk * a_Chunk, int a_RelX, int a_RelY, int
{
BlockY = y + 1;
}
+ else if ((FallingBlockType == E_BLOCK_CONCRETE_POWDER) && IsBlockWater(BlockType))
+ {
+ FallingBlockType = E_BLOCK_CONCRETE;
+ BlockY = y;
+ }
else
{
// Can fall further down