summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-03-23 12:25:22 +0100
committerMattes D <github@xoft.cz>2015-03-23 12:25:22 +0100
commitf1ef7f57ff76e9d321276059454950297d5a6a39 (patch)
treedb230dbd9bdf920f6553b6ef59d1bae286b7918c /src/Entities
parentMerge pull request #1792 from mc-server/APIDocs (diff)
parentCorrect world height validations. (diff)
downloadcuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.gz
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.bz2
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.lz
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.xz
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.zst
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Boat.cpp2
-rw-r--r--src/Entities/FallingBlock.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/Entities/Boat.cpp b/src/Entities/Boat.cpp
index 6d8b4ef31..6177eb32f 100644
--- a/src/Entities/Boat.cpp
+++ b/src/Entities/Boat.cpp
@@ -98,7 +98,7 @@ void cBoat::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
SetSpeed(GetSpeed() * 0.97); // Slowly decrease the speed
- if ((POSY_TOINT < 0) || (POSY_TOINT > cChunkDef::Height))
+ if ((POSY_TOINT < 0) || (POSY_TOINT >= cChunkDef::Height))
{
return;
}
diff --git a/src/Entities/FallingBlock.cpp b/src/Entities/FallingBlock.cpp
index 75105a0cd..7301a3c9d 100644
--- a/src/Entities/FallingBlock.cpp
+++ b/src/Entities/FallingBlock.cpp
@@ -77,7 +77,10 @@ void cFallingBlock::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
);
*/
- cSandSimulator::FinishFalling(m_World, BlockX, BlockY + 1, BlockZ, m_BlockType, m_BlockMeta);
+ if (BlockY < cChunkDef::Height - 1)
+ {
+ cSandSimulator::FinishFalling(m_World, BlockX, BlockY + 1, BlockZ, m_BlockType, m_BlockMeta);
+ }
Destroy(true);
return;
}