summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNiLSPACE <NiLSPACE@users.noreply.github.com>2015-11-23 11:55:34 +0100
committerNiLSPACE <NiLSPACE@users.noreply.github.com>2015-11-23 11:55:34 +0100
commit002019e9ad545335c28e7309b087baa64993723d (patch)
tree543ddb9986d9062f964b8f8d0d1d6dd21bdbfcab /src
parentMerge pull request #2678 from cuberite/ln (diff)
parentAdjusted height validation using cChunkDef::IsValidHeight() (diff)
downloadcuberite-002019e9ad545335c28e7309b087baa64993723d.tar
cuberite-002019e9ad545335c28e7309b087baa64993723d.tar.gz
cuberite-002019e9ad545335c28e7309b087baa64993723d.tar.bz2
cuberite-002019e9ad545335c28e7309b087baa64993723d.tar.lz
cuberite-002019e9ad545335c28e7309b087baa64993723d.tar.xz
cuberite-002019e9ad545335c28e7309b087baa64993723d.tar.zst
cuberite-002019e9ad545335c28e7309b087baa64993723d.zip
Diffstat (limited to 'src')
-rw-r--r--src/Blocks/BlockDirt.h2
-rw-r--r--src/Chunk.cpp18
-rw-r--r--src/ChunkMap.cpp2
3 files changed, 11 insertions, 11 deletions
diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h
index d93bdd22d..813ff5b24 100644
--- a/src/Blocks/BlockDirt.h
+++ b/src/Blocks/BlockDirt.h
@@ -77,7 +77,7 @@ public:
BLOCKTYPE DestBlock;
NIBBLETYPE DestMeta;
- if ((a_RelY + OfsY < 0) || (a_RelY + OfsY >= cChunkDef::Height - 1))
+ if (!cChunkDef::IsValidHeight(a_RelY + OfsY))
{
// Y Coord out of range
continue;
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index 3e4a497be..71e9fb76c 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -1132,7 +1132,7 @@ void cChunk::GrowCactus(int a_RelX, int a_RelY, int a_RelZ, int a_NumBlocks)
bool cChunk::UnboundedRelGetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta) const
{
- if ((a_RelY < 0) || (a_RelY >= cChunkDef::Height))
+ if (!cChunkDef::IsValidHeight(a_RelY))
{
LOGWARNING("%s: requesting a block with a_RelY out of range: %d", __FUNCTION__, a_RelY);
return false;
@@ -1153,7 +1153,7 @@ bool cChunk::UnboundedRelGetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE
bool cChunk::UnboundedRelGetBlockType(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE & a_BlockType) const
{
- if ((a_RelY < 0) || (a_RelY >= cChunkDef::Height))
+ if (!cChunkDef::IsValidHeight(a_RelY))
{
LOGWARNING("%s: requesting a block with a_RelY out of range: %d", __FUNCTION__, a_RelY);
return false;
@@ -1174,7 +1174,7 @@ bool cChunk::UnboundedRelGetBlockType(int a_RelX, int a_RelY, int a_RelZ, BLOCKT
bool cChunk::UnboundedRelGetBlockMeta(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE & a_BlockMeta) const
{
- if ((a_RelY < 0) || (a_RelY >= cChunkDef::Height))
+ if (!cChunkDef::IsValidHeight(a_RelY))
{
LOGWARNING("%s: requesting a block with a_RelY out of range: %d", __FUNCTION__, a_RelY);
return false;
@@ -1195,7 +1195,7 @@ bool cChunk::UnboundedRelGetBlockMeta(int a_RelX, int a_RelY, int a_RelZ, NIBBLE
bool cChunk::UnboundedRelGetBlockBlockLight(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE & a_BlockBlockLight) const
{
- if ((a_RelY < 0) || (a_RelY >= cChunkDef::Height))
+ if (!cChunkDef::IsValidHeight(a_RelY))
{
LOGWARNING("%s: requesting a block with a_RelY out of range: %d", __FUNCTION__, a_RelY);
return false;
@@ -1216,7 +1216,7 @@ bool cChunk::UnboundedRelGetBlockBlockLight(int a_RelX, int a_RelY, int a_RelZ,
bool cChunk::UnboundedRelGetBlockSkyLight(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE & a_BlockSkyLight) const
{
- if ((a_RelY < 0) || (a_RelY >= cChunkDef::Height))
+ if (!cChunkDef::IsValidHeight(a_RelY))
{
LOGWARNING("%s: requesting a block with a_RelY out of range: %d", __FUNCTION__, a_RelY);
return false;
@@ -1237,7 +1237,7 @@ bool cChunk::UnboundedRelGetBlockSkyLight(int a_RelX, int a_RelY, int a_RelZ, NI
bool cChunk::UnboundedRelGetBlockLights(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE & a_BlockLight, NIBBLETYPE & a_SkyLight) const
{
- if ((a_RelY < 0) || (a_RelY >= cChunkDef::Height))
+ if (!cChunkDef::IsValidHeight(a_RelY))
{
LOGWARNING("%s: requesting a block with a_RelY out of range: %d", __FUNCTION__, a_RelY);
return false;
@@ -1259,7 +1259,7 @@ bool cChunk::UnboundedRelGetBlockLights(int a_RelX, int a_RelY, int a_RelZ, NIBB
bool cChunk::UnboundedRelSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
{
- if ((a_RelY < 0) || (a_RelY >= cChunkDef::Height))
+ if (!cChunkDef::IsValidHeight(a_RelY))
{
LOGWARNING("UnboundedRelSetBlock(): requesting a block with a_RelY out of range: %d", a_RelY);
return false;
@@ -1280,7 +1280,7 @@ bool cChunk::UnboundedRelSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE
bool cChunk::UnboundedRelFastSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
{
- if ((a_RelY < 0) || (a_RelY >= cChunkDef::Height))
+ if (!cChunkDef::IsValidHeight(a_RelY))
{
LOGWARNING("UnboundedRelFastSetBlock(): requesting a block with a_RelY out of range: %d", a_RelY);
return false;
@@ -1301,7 +1301,7 @@ bool cChunk::UnboundedRelFastSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKT
void cChunk::UnboundedQueueTickBlock(int a_RelX, int a_RelY, int a_RelZ)
{
- if ((a_RelY < 0) || (a_RelY >= cChunkDef::Height))
+ if (!cChunkDef::IsValidHeight(a_RelY))
{
// Outside of chunkmap
return;
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index d95ffd6ef..0d1127997 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1859,7 +1859,7 @@ bool cChunkMap::ForEachEntityInBox(const cBoundingBox & a_Box, cEntityCallback &
void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_BlockY, double a_BlockZ, cVector3iArray & a_BlocksAffected)
{
// Don't explode if outside of Y range (prevents the following test running into unallocated memory):
- if ((a_BlockY < 0) || (a_BlockY > cChunkDef::Height - 1))
+ if (!cChunkDef::IsValidHeight(static_cast<int>(a_BlockY)))
{
return;
}