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

Grass now only dies if it has an opaque block above it.

Browse Source 
Grass only spreads to a dirt block if the light level is above 4 and the block above it is transparent.
This commit is contained in:
Samuel Barney 2015-07-02 16:16:05 -06:00
parent 404cf5dcfd
commit e248539d74
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Blocks/BlockDirt.h
View File

@ -3,6 +3,7 @@
#include "BlockHandler.h"
#include "../FastRandom.h"
#include "../BlockInfo.h"
#include "Root.h"
#include "Bindings/PluginManager.h"
@ -48,13 +49,15 @@ public:
}
else if ((a_RelY < cChunkDef::Height - 1))
{
BLOCKTYPE above = a_Chunk.GetBlock(a_RelX, a_RelY + 1, a_RelZ);
NIBBLETYPE light = std::max(a_Chunk.GetBlockLight(a_RelX, a_RelY + 1, a_RelZ), a_Chunk.GetTimeAlteredLight(a_Chunk.GetSkyLight(a_RelX, a_RelY + 1, a_RelZ)));
// Grass turns back to dirt when light levels are below 5
if (light < 5)
// Grass turns back to dirt when light levels are below 5 and the block above is not transparent
if (!cBlockInfo::IsTransparent(above))
{
a_Chunk.FastSetBlock(a_RelX, a_RelY, a_RelZ, E_BLOCK_DIRT, E_META_DIRT_NORMAL);
return;
}
// Source block is not bright enough to spread
if (light < 9)
{
@ -93,10 +96,10 @@ public:
// Not a regular dirt block
continue;
}
BLOCKTYPE above = a_Chunk.GetBlock(BlockX, BlockY + 1, BlockZ);
NIBBLETYPE light = std::max(a_Chunk.GetBlockLight(BlockX, BlockY + 1, BlockZ), a_Chunk.GetTimeAlteredLight(a_Chunk.GetSkyLight(BlockX, BlockY + 1, BlockZ)));
// Grass does not spread to blocks with a light level less than 5
if (light > 4)
if (light > 4 && cBlockInfo::IsTransparent(above))
{
if (!cRoot::Get()->GetPluginManager()->CallHookBlockSpread(*Chunk->GetWorld(), Chunk->GetPosX() * cChunkDef::Width + BlockX, BlockY, Chunk->GetPosZ() * cChunkDef::Width + BlockZ, ssGrassSpread))
{