ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74 from tigerw/master 

Further attempt at fixing torch placements
master
Tiger Wang 2013-08-11 12:44:54 -07:00
parent a9359086ef 93f5a4388c
commit 1599d607d1
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Blocks/BlockFlower.h
View File

@ -32,7 +32,7 @@ public:
virtual bool DoesAllowBlockOnTop(void) override virtual bool DoesAllowBlockOnTop(void) override
{ {
return false; return true;
} }

27
source/Blocks/BlockTorch.h
View File

@ -109,21 +109,18 @@ public:
static bool CanBePlacedOn(BLOCKTYPE a_BlockType, char a_Direction) static bool CanBePlacedOn(BLOCKTYPE a_BlockType, char a_Direction)
{ {
switch (a_BlockType) //case E_BLOCK_GLASS:
{ //case E_BLOCK_FENCE:
case E_BLOCK_GLASS: //case E_BLOCK_NETHER_BRICK_FENCE:
case E_BLOCK_FENCE: //case E_BLOCK_PISTON:
case E_BLOCK_NETHER_BRICK_FENCE: //case E_BLOCK_IRON_BARS
case E_BLOCK_PISTON: if ( g_BlockIsSolid[a_BlockType] ) {
case E_BLOCK_WORKBENCH: return (a_Direction == 0x1); // allow only direction "standing on floor"
{ }
return (a_Direction == 0x1); // allow only direction "standing on floor" else {
} //default:
//{
default: return g_BlockIsSolid[a_BlockType];
{
return g_BlockIsSolid[a_BlockType];
}
} }
} }

2
source/Generating/ComposableGenerator.cpp
View File

@ -207,7 +207,7 @@ void cComposableGenerator::InitBiomeGen(cIniFile & a_IniFile)
); );
CacheSize = 4; 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_UnderlyingBiomeGen = m_BiomeGen;
m_BiomeGen = new cBioGenCache(m_UnderlyingBiomeGen, CacheSize); m_BiomeGen = new cBioGenCache(m_UnderlyingBiomeGen, CacheSize);
} }