summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockTorch.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-22 19:30:31 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-22 19:30:31 +0200
commit18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2 (patch)
tree089b3be905aa030367925762c58bd30b08f5f3f6 /src/Blocks/BlockTorch.h
parentMerge branch 'master' into saplingsandleaves (diff)
parentUpdated prefabs to current Gallery content. (diff)
downloadcuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.gz
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.bz2
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.lz
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.xz
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.zst
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.zip
Diffstat (limited to 'src/Blocks/BlockTorch.h')
-rw-r--r--src/Blocks/BlockTorch.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h
index 73f2bf9a8..c73118870 100644
--- a/src/Blocks/BlockTorch.h
+++ b/src/Blocks/BlockTorch.h
@@ -99,7 +99,7 @@ public:
static bool CanBePlacedOn(BLOCKTYPE a_BlockType, eBlockFace a_BlockFace)
{
- if ( !cBlockInfo::FullyOccupiesVoxel(a_BlockType) )
+ if (!cBlockInfo::FullyOccupiesVoxel(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
}
@@ -119,7 +119,8 @@ public:
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, Face, true);
BLOCKTYPE BlockInQuestion = a_ChunkInterface.GetBlock(a_BlockX, a_BlockY, a_BlockZ);
- if ( // If on a block that can only hold a torch if torch is standing on it, return that face
+ // If on a block that can only hold a torch if torch is standing on it, return that face
+ if (
((BlockInQuestion == E_BLOCK_GLASS) ||
(BlockInQuestion == E_BLOCK_FENCE) ||
(BlockInQuestion == E_BLOCK_NETHER_BRICK_FENCE) ||
@@ -167,7 +168,7 @@ public:
// No need to check for upright orientation, it was done when the torch was placed
return true;
}
- else if ( !cBlockInfo::FullyOccupiesVoxel(BlockInQuestion) )
+ else if (!cBlockInfo::FullyOccupiesVoxel(BlockInQuestion))
{
return false;
}