summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-11 12:58:57 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-11 12:58:57 +0200
commitbaae26ab223f27bdcbd8d8c3cd9af890c9190e4d (patch)
tree1fa94dc7bd9767592f0c89b99f5afbbd70e0dccd /source
parentAdded OnPlayerAnimation() hook. (diff)
downloadcuberite-baae26ab223f27bdcbd8d8c3cd9af890c9190e4d.tar
cuberite-baae26ab223f27bdcbd8d8c3cd9af890c9190e4d.tar.gz
cuberite-baae26ab223f27bdcbd8d8c3cd9af890c9190e4d.tar.bz2
cuberite-baae26ab223f27bdcbd8d8c3cd9af890c9190e4d.tar.lz
cuberite-baae26ab223f27bdcbd8d8c3cd9af890c9190e4d.tar.xz
cuberite-baae26ab223f27bdcbd8d8c3cd9af890c9190e4d.tar.zst
cuberite-baae26ab223f27bdcbd8d8c3cd9af890c9190e4d.zip
Diffstat (limited to 'source')
-rw-r--r--source/Blocks/BlockFlower.h2
-rw-r--r--source/Blocks/BlockTorch.h18
2 files changed, 10 insertions, 10 deletions
diff --git a/source/Blocks/BlockFlower.h b/source/Blocks/BlockFlower.h
index 202609538..952901ba5 100644
--- a/source/Blocks/BlockFlower.h
+++ b/source/Blocks/BlockFlower.h
@@ -32,7 +32,7 @@ public:
virtual bool DoesAllowBlockOnTop(void) override
{
- return false;
+ return true;
}
diff --git a/source/Blocks/BlockTorch.h b/source/Blocks/BlockTorch.h
index c94c4c436..816d1b69f 100644
--- a/source/Blocks/BlockTorch.h
+++ b/source/Blocks/BlockTorch.h
@@ -111,17 +111,17 @@ public:
{
switch (a_BlockType)
{
- case E_BLOCK_GLASS:
- case E_BLOCK_FENCE:
- case E_BLOCK_NETHER_BRICK_FENCE:
- case E_BLOCK_PISTON:
- case E_BLOCK_WORKBENCH:
- {
+ //case E_BLOCK_GLASS:
+ //case E_BLOCK_FENCE:
+ //case E_BLOCK_NETHER_BRICK_FENCE:
+ //case E_BLOCK_PISTON:
+ //case E_BLOCK_IRON_BARS
+ if ( g_BlockIsSolid[a_BlockType] {
return (a_Direction == 0x1); // allow only direction "standing on floor"
}
-
- default:
- {
+ else {
+ //default:
+ //{
return g_BlockIsSolid[a_BlockType];
}
}