flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Change SetBlock to FastSetBlock in cRedstone.cpp and grass will now grow if any one hit block is above it.

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@65 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
admin@omencraft.com
2011-11-05 19:31:25 +00:00
parent b7bff510f9
commit 7fe70356b9
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/cChunk.cpp
View File

@@ -323,22 +323,27 @@ void cChunk::Tick(float a_Dt)
case E_BLOCK_DIRT:
{
char AboveBlock = GetBlock( Index+1 );
if( AboveBlock == 0 && GetLight( m_BlockSkyLight, Index ) > 0xf/2 ) // Half lit
if ( (AboveBlock == 0) && GetLight( m_BlockSkyLight, Index ) > 0xf/2 ) // Half lit //changed to not allow grass if any one hit object is on top
{
FastSetBlock( m_BlockTickX, m_BlockTickY, m_BlockTickZ, E_BLOCK_GRASS, GetLight( m_BlockMeta, Index ) );
}
if ( (g_BlockOneHitDig[AboveBlock]) && GetLight( m_BlockSkyLight, Index+1 ) > 0xf/2 ) // Half lit //ch$
{
FastSetBlock( m_BlockTickX, m_BlockTickY, m_BlockTickZ, E_BLOCK_GRASS, GetLight( m_BlockMeta, Index ) );
}
}
break;
case E_BLOCK_GRASS:
{
char AboveBlock = GetBlock( Index+1 );
if( AboveBlock != 0 )
if (!( (AboveBlock == 0) || (g_BlockOneHitDig[AboveBlock]) ) ) //changed to not allow grass if any one hit object is on top
{
FastSetBlock( m_BlockTickX, m_BlockTickY, m_BlockTickZ, E_BLOCK_DIRT, GetLight( m_BlockMeta, Index ) );
}
}
break;
case E_BLOCK_SAPLING:
case E_BLOCK_SAPLING: //todo: check meta of sapling. change m_World->GrowTree to look change trunk and leaves based on meta of sapling
{
FastSetBlock( m_BlockTickX, m_BlockTickY, m_BlockTickZ, E_BLOCK_AIR, GetLight( m_BlockMeta, Index ) );
m_World->GrowTree( m_BlockTickX + m_PosX*16, m_BlockTickY, m_BlockTickZ + m_PosZ*16 );
@@ -722,7 +727,7 @@ float GetOreNoise( float x, float y, float z, cNoise & a_Noise )
void cChunk::GenerateTerrain()
{
const ENUM_BLOCK_ID GrassID = E_BLOCK_GRASS;
const ENUM_BLOCK_ID DirtID = E_BLOCK_DIRT;
const ENUM_BLOCK_ID StoneID = E_BLOCK_STONE;
@@ -733,8 +738,8 @@ void cChunk::GenerateTerrain()
const ENUM_BLOCK_ID IronID = E_BLOCK_IRON_ORE;
const ENUM_BLOCK_ID GoldID = E_BLOCK_GOLD_ORE;
const ENUM_BLOCK_ID DiamondID = E_BLOCK_DIAMOND_ORE;
const ENUM_BLOCK_ID RedID = E_BLOCK_REDSTONE_ORE;
const ENUM_BLOCK_ID RedID = E_BLOCK_REDSTONE_ORE;
/*
const ENUM_BLOCK_ID GrassID = E_BLOCK_AIR;
const ENUM_BLOCK_ID DirtID = E_BLOCK_AIR;