diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-04-06 21:41:01 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-04-06 21:41:01 +0200 |
| commit | 039191499caec958d3d79773e4ed1c1c4e2916c2 (patch) | |
| tree | dd32b3f7dce4d31f0d8a40e8b84dad4285358cb4 /src/Blocks/BlockDirt.h | |
| parent | Merge branch 'master' into Slabs (diff) | |
| download | cuberite-039191499caec958d3d79773e4ed1c1c4e2916c2.tar cuberite-039191499caec958d3d79773e4ed1c1c4e2916c2.tar.gz cuberite-039191499caec958d3d79773e4ed1c1c4e2916c2.tar.bz2 cuberite-039191499caec958d3d79773e4ed1c1c4e2916c2.tar.lz cuberite-039191499caec958d3d79773e4ed1c1c4e2916c2.tar.xz cuberite-039191499caec958d3d79773e4ed1c1c4e2916c2.tar.zst cuberite-039191499caec958d3d79773e4ed1c1c4e2916c2.zip | |
Diffstat (limited to 'src/Blocks/BlockDirt.h')
| -rw-r--r-- | src/Blocks/BlockDirt.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h index bde8e4201..84c8461b5 100644 --- a/src/Blocks/BlockDirt.h +++ b/src/Blocks/BlockDirt.h @@ -39,7 +39,7 @@ public: BLOCKTYPE Above; NIBBLETYPE AboveMeta; a_Chunk.GetBlockTypeMeta(a_RelX, a_RelY + 1, a_RelZ, Above, AboveMeta); - if ((!cBlockInfo::IsTransparent(Above) && !cBlockInfo::IsOneHitDig(Above) && !(cBlockSlabHandler::IsAnySlabType(Above) && (AboveMeta & 0x8))) || IsBlockWater(Above)) + if ((IsBlockWater(Above)) || !cBlockInfo::GetHandler(Above)->CanChangeDirtToGrass(Above, AboveMeta)) { a_Chunk.FastSetBlock(a_RelX, a_RelY, a_RelZ, E_BLOCK_DIRT, E_META_DIRT_NORMAL); return; @@ -67,7 +67,7 @@ public: cChunk * Chunk = a_Chunk.GetRelNeighborChunkAdjustCoords(BlockX, BlockZ); if (Chunk == NULL) { - // Unloaded chunk + // Unloaded chunks continue; } Chunk->GetBlockTypeMeta(BlockX, BlockY, BlockZ, DestBlock, DestMeta); @@ -80,7 +80,7 @@ public: BLOCKTYPE AboveDest; NIBBLETYPE AboveMeta; Chunk->GetBlockTypeMeta(BlockX, BlockY + 1, BlockZ, AboveDest, AboveMeta); - if ((cBlockInfo::IsOneHitDig(AboveDest) || cBlockInfo::IsTransparent(AboveDest) || ((cBlockSlabHandler::IsAnySlabType(AboveDest)) && (AboveMeta & 0x8))) && !IsBlockWater(AboveDest)) + if ((!IsBlockWater(AboveDest)) && (cBlockInfo::GetHandler(AboveDest)->CanChangeDirtToGrass(AboveDest, AboveMeta))) { if (!cRoot::Get()->GetPluginManager()->CallHookBlockSpread((cWorld*) &a_WorldInterface, BlockX * cChunkDef::Width, BlockY, BlockZ * cChunkDef::Width, ssGrassSpread)) { |