summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockFluid.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-31 21:33:33 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-31 21:33:33 +0200
commit0836fe9a84e59b083db368205cbf6496355378bf (patch)
treeb3d5a4b35d868380c5794d2cc1ff838cf2237906 /src/Blocks/BlockFluid.h
parentFixed a few clang warnings. (diff)
downloadcuberite-0836fe9a84e59b083db368205cbf6496355378bf.tar
cuberite-0836fe9a84e59b083db368205cbf6496355378bf.tar.gz
cuberite-0836fe9a84e59b083db368205cbf6496355378bf.tar.bz2
cuberite-0836fe9a84e59b083db368205cbf6496355378bf.tar.lz
cuberite-0836fe9a84e59b083db368205cbf6496355378bf.tar.xz
cuberite-0836fe9a84e59b083db368205cbf6496355378bf.tar.zst
cuberite-0836fe9a84e59b083db368205cbf6496355378bf.zip
Diffstat (limited to 'src/Blocks/BlockFluid.h')
-rw-r--r--src/Blocks/BlockFluid.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Blocks/BlockFluid.h b/src/Blocks/BlockFluid.h
index 37885e4de..361b97c60 100644
--- a/src/Blocks/BlockFluid.h
+++ b/src/Blocks/BlockFluid.h
@@ -93,8 +93,8 @@ public:
// Check if it's fuel:
BLOCKTYPE BlockType;
if (
- !a_Chunk.UnboundedRelGetBlockType(a_RelX + x, a_RelY + y, a_RelZ + z, BlockType) ||
- !cFireSimulator::IsFuel(BlockType)
+ ((a_RelY + y < 0) || (a_RelY + y > cChunkDef::Height)) ||
+ (!a_Chunk.UnboundedRelGetBlockType(a_RelX + x, a_RelY + y, a_RelZ + z, BlockType) || !cFireSimulator::IsFuel(BlockType))
)
{
return false;
@@ -119,6 +119,7 @@ public:
for (size_t i = 0; i < ARRAYCOUNT(CrossCoords); i++)
{
if (
+ ((RelY + CrossCoords[i].y >= 0) && (RelY + CrossCoords[i].y <= cChunkDef::Height)) &&
a_Chunk.UnboundedRelGetBlockType(RelX + CrossCoords[i].x, RelY + CrossCoords[i].y, RelZ + CrossCoords[i].z, BlockType) &&
(BlockType == E_BLOCK_AIR)
)