summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-11 21:44:54 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-11 21:44:54 +0200
commit1599d607d121e5b8b1cdebff12603bf139174ea4 (patch)
tree03ebb3f8a456d1945c6cf00514c3fb8d955b0b02
parentDragged in the latest core changes. (diff)
parentRemoved unneeded case clause (diff)
downloadcuberite-1599d607d121e5b8b1cdebff12603bf139174ea4.tar
cuberite-1599d607d121e5b8b1cdebff12603bf139174ea4.tar.gz
cuberite-1599d607d121e5b8b1cdebff12603bf139174ea4.tar.bz2
cuberite-1599d607d121e5b8b1cdebff12603bf139174ea4.tar.lz
cuberite-1599d607d121e5b8b1cdebff12603bf139174ea4.tar.xz
cuberite-1599d607d121e5b8b1cdebff12603bf139174ea4.tar.zst
cuberite-1599d607d121e5b8b1cdebff12603bf139174ea4.zip
Diffstat (limited to '')
-rw-r--r--source/Blocks/BlockFlower.h2
-rw-r--r--source/Blocks/BlockTorch.h27
-rw-r--r--source/Generating/ComposableGenerator.cpp2
3 files changed, 14 insertions, 17 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..f774e15a0 100644
--- a/source/Blocks/BlockTorch.h
+++ b/source/Blocks/BlockTorch.h
@@ -109,21 +109,18 @@ public:
static bool CanBePlacedOn(BLOCKTYPE a_BlockType, char a_Direction)
{
- 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:
- {
- return (a_Direction == 0x1); // allow only direction "standing on floor"
- }
-
- default:
- {
- return g_BlockIsSolid[a_BlockType];
- }
+ //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"
+ }
+ else {
+ //default:
+ //{
+ return g_BlockIsSolid[a_BlockType];
}
}
diff --git a/source/Generating/ComposableGenerator.cpp b/source/Generating/ComposableGenerator.cpp
index fb31ec7b2..8763e2809 100644
--- a/source/Generating/ComposableGenerator.cpp
+++ b/source/Generating/ComposableGenerator.cpp
@@ -207,7 +207,7 @@ void cComposableGenerator::InitBiomeGen(cIniFile & a_IniFile)
);
CacheSize = 4;
}
- LOGINFO("Using a cache for biomegen of size %d.", CacheSize);
+ LOGD("Using a cache for biomegen of size %d.", CacheSize);
m_UnderlyingBiomeGen = m_BiomeGen;
m_BiomeGen = new cBioGenCache(m_UnderlyingBiomeGen, CacheSize);
}