diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-08-20 22:25:05 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-08-20 22:25:05 +0200 |
| commit | f7774ec33638bfc30cc29c1f70850a6072a31c93 (patch) | |
| tree | c2c2896b87de9241b1555e4e2580aa6b3f401870 /src/Blocks/BlockTorch.h | |
| parent | Revert "Removes the fire if the block under the fire was broken." (diff) | |
| parent | Merge pull request #1335 from mc-server/CodeFixes (diff) | |
| download | cuberite-f7774ec33638bfc30cc29c1f70850a6072a31c93.tar cuberite-f7774ec33638bfc30cc29c1f70850a6072a31c93.tar.gz cuberite-f7774ec33638bfc30cc29c1f70850a6072a31c93.tar.bz2 cuberite-f7774ec33638bfc30cc29c1f70850a6072a31c93.tar.lz cuberite-f7774ec33638bfc30cc29c1f70850a6072a31c93.tar.xz cuberite-f7774ec33638bfc30cc29c1f70850a6072a31c93.tar.zst cuberite-f7774ec33638bfc30cc29c1f70850a6072a31c93.zip | |
Diffstat (limited to 'src/Blocks/BlockTorch.h')
| -rw-r--r-- | src/Blocks/BlockTorch.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h index c73118870..df5574d5d 100644 --- a/src/Blocks/BlockTorch.h +++ b/src/Blocks/BlockTorch.h @@ -126,7 +126,7 @@ public: (BlockInQuestion == E_BLOCK_NETHER_BRICK_FENCE) || (BlockInQuestion == E_BLOCK_COBBLESTONE_WALL)) && (Face == BLOCK_FACE_TOP) - ) + ) { return Face; } @@ -162,7 +162,7 @@ public: (BlockInQuestion == E_BLOCK_END_PORTAL_FRAME) || // Actual vanilla behaviour (BlockInQuestion == E_BLOCK_NETHER_BRICK_FENCE) || (BlockInQuestion == E_BLOCK_COBBLESTONE_WALL) - ) + ) { // Torches can be placed on tops of glass and fences, despite them being 'untorcheable' // No need to check for upright orientation, it was done when the torch was placed |