summaryrefslogtreecommitdiffstats
path: root/source/Blocks
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2013-10-29 22:32:31 +0100
committerMattes D <github@xoft.cz>2013-10-29 22:32:31 +0100
commit9497e11ad4ab43b73590cd595978c69f5fd97606 (patch)
tree6a2d23f55d6fbb7294ee34c9147e907bad279143 /source/Blocks
parentProtoProxy: Updated the server-side packets to 1.7. (diff)
parentGrass no longer grows under water, and water on top kills it. (diff)
downloadcuberite-9497e11ad4ab43b73590cd595978c69f5fd97606.tar
cuberite-9497e11ad4ab43b73590cd595978c69f5fd97606.tar.gz
cuberite-9497e11ad4ab43b73590cd595978c69f5fd97606.tar.bz2
cuberite-9497e11ad4ab43b73590cd595978c69f5fd97606.tar.lz
cuberite-9497e11ad4ab43b73590cd595978c69f5fd97606.tar.xz
cuberite-9497e11ad4ab43b73590cd595978c69f5fd97606.tar.zst
cuberite-9497e11ad4ab43b73590cd595978c69f5fd97606.zip
Diffstat (limited to 'source/Blocks')
-rw-r--r--source/Blocks/BlockDirt.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/Blocks/BlockDirt.h b/source/Blocks/BlockDirt.h
index b2bc4756c..c694d79f6 100644
--- a/source/Blocks/BlockDirt.h
+++ b/source/Blocks/BlockDirt.h
@@ -37,7 +37,7 @@ public:
if (a_BlockY < cChunkDef::Height - 1)
{
BLOCKTYPE Above = a_World->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ);
- if (!g_BlockTransparent[Above] && !g_BlockOneHitDig[Above])
+ if ((!g_BlockTransparent[Above] && !g_BlockOneHitDig[Above]) || IsBlockWater(Above))
{
a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_DIRT, 0);
return;
@@ -69,7 +69,7 @@ public:
NIBBLETYPE AboveMeta;
IsValid = a_World->GetBlockTypeMeta(a_BlockX + OfsX, a_BlockY + OfsY + 1, a_BlockZ + OfsZ, AboveDest, AboveMeta);
ASSERT(IsValid); // WTF - how did we get the DestBlock if AboveBlock is not valid?
- if (g_BlockOneHitDig[AboveDest] || g_BlockTransparent[AboveDest])
+ if ((g_BlockOneHitDig[AboveDest] || g_BlockTransparent[AboveDest]) && !IsBlockWater(AboveDest))
{
a_World->FastSetBlock(a_BlockX + OfsX, a_BlockY + OfsY, a_BlockZ + OfsZ, E_BLOCK_GRASS, 0);
}