diff options
author | Mattes D <github@xoft.cz> | 2014-03-02 16:13:43 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-03-02 16:13:43 +0100 |
commit | b17d04737d11c5698a6869c70031646723d79f11 (patch) | |
tree | d71275553552a16dd2b9ba949cd5abf8baf9fa5a /src/Blocks/BlockTorch.h | |
parent | Merge pull request #745 from tonibm19/master (diff) | |
parent | GetById => Get (diff) | |
download | cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.gz cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.bz2 cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.lz cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.xz cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.zst cuberite-b17d04737d11c5698a6869c70031646723d79f11.zip |
Diffstat (limited to 'src/Blocks/BlockTorch.h')
-rw-r--r-- | src/Blocks/BlockTorch.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h index f2a4c8665..84bbb37ec 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 ( !g_BlockFullyOccupiesVoxel[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 } @@ -129,7 +129,7 @@ public: { return Face; } - else if ((g_BlockFullyOccupiesVoxel[BlockInQuestion]) && (i != BLOCK_FACE_BOTTOM)) + else if (cBlockInfo::FullyOccupiesVoxel(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 Face; @@ -163,7 +163,7 @@ public: // No need to check for upright orientation, it was done when the torch was placed return true; } - else if ( !g_BlockFullyOccupiesVoxel[BlockInQuestion] ) + else if ( !cBlockInfo::FullyOccupiesVoxel(BlockInQuestion) ) { return false; } |