summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockTorch.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-01-11 02:51:24 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-01-11 02:51:24 +0100
commitb068b73ad9cce7a5150c589b66d6465a8a4d0b90 (patch)
tree2d6a5be4229ca18171a7d6e41a9287f7f191ca94 /src/Blocks/BlockTorch.h
parentFixed doors, fixes #453 (diff)
downloadcuberite-b068b73ad9cce7a5150c589b66d6465a8a4d0b90.tar
cuberite-b068b73ad9cce7a5150c589b66d6465a8a4d0b90.tar.gz
cuberite-b068b73ad9cce7a5150c589b66d6465a8a4d0b90.tar.bz2
cuberite-b068b73ad9cce7a5150c589b66d6465a8a4d0b90.tar.lz
cuberite-b068b73ad9cce7a5150c589b66d6465a8a4d0b90.tar.xz
cuberite-b068b73ad9cce7a5150c589b66d6465a8a4d0b90.tar.zst
cuberite-b068b73ad9cce7a5150c589b66d6465a8a4d0b90.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockTorch.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h
index 9e543dfd7..faba9c4f5 100644
--- a/src/Blocks/BlockTorch.h
+++ b/src/Blocks/BlockTorch.h
@@ -98,7 +98,7 @@ public:
static bool CanBePlacedOn(BLOCKTYPE a_BlockType, char a_BlockFace)
{
- if ( !g_BlockIsTorchPlaceable[a_BlockType] )
+ if ( !g_BlockFullyOccupiesVoxel[a_BlockType] )
{
return (a_BlockFace == BLOCK_FACE_TOP); // Allow placement only when torch upright (for glass, etc.); exceptions won't even be sent by client, no need to handle
}
@@ -127,7 +127,7 @@ public:
{
return i;
}
- else if ((g_BlockIsTorchPlaceable[BlockInQuestion]) && (i != BLOCK_FACE_BOTTOM))
+ else if ((g_BlockFullyOccupiesVoxel[BlockInQuestion]) && (i != BLOCK_FACE_BOTTOM))
{
// Otherwise, if block in that direction is torch placeable and we haven't gotten to it via the bottom face, return that face
return i;
@@ -161,7 +161,7 @@ public:
// No need to check for upright orientation, it was done when the torch was placed
return true;
}
- else if ( !g_BlockIsTorchPlaceable[BlockInQuestion] )
+ else if ( !g_BlockFullyOccupiesVoxel[BlockInQuestion] )
{
return false;
}