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

Grass blockticking fix

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@689 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-07-21 15:25:55 +00:00
parent ab860e6573
commit 02edaa4c81
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
source/blocks/BlockDirt.h
View File

@ -25,41 +25,43 @@ public:
void OnUpdate(cWorld *a_World, int a_X, int a_Y, int a_Z) override
{
if(m_BlockID == E_BLOCK_GRASS)
if (m_BlockID != E_BLOCK_GRASS)
{
//Grass becomes dirt if there is something on top of them
BLOCKTYPE Above = a_World->GetBlock(a_X, a_Y + 1, a_Z);
if(!g_BlockTransparent[Above] && !g_BlockOneHitDig[Above])
return;
}
// Grass becomes dirt if there is something on top of it:
BLOCKTYPE Above = a_World->GetBlock(a_X, a_Y + 1, a_Z);
if (!g_BlockTransparent[Above] && !g_BlockOneHitDig[Above])
{
a_World->FastSetBlock(a_X, a_Y, a_Z, E_BLOCK_DIRT, 0);
return;
}
// Grass spreads to adjacent blocks:
MTRand rand;
for (int i = 0; i < 2; i++) // Pick two blocks to grow to
{
int OfsX = rand.randInt(2) - 1; // [-1 .. 1]
int OfsY = rand.randInt(4) - 3; // [-3 .. 1]
int OfsZ = rand.randInt(2) - 1; // [-1 .. 1]
BLOCKTYPE DestBlock;
NIBBLETYPE DestMeta;
a_World->GetBlockTypeMeta(a_X + OfsX, a_Y + OfsY, a_Z + OfsZ, DestBlock, DestMeta);
if(DestBlock != E_BLOCK_DIRT)
{
a_World->FastSetBlock(a_X, a_Y, a_Z, E_BLOCK_DIRT, 0);
continue;
}
MTRand rand;
for (int i = 0; i < 2; i++) // Pick two blocks to grow to
BLOCKTYPE AboveDest;
NIBBLETYPE AboveMeta;
a_World->GetBlockTypeMeta(a_X + OfsX, a_Y + OfsY + 1, a_Z + OfsZ, AboveDest, AboveMeta);
if (g_BlockOneHitDig[AboveDest] || g_BlockTransparent[AboveDest])
{
int OfsX = rand.randInt(2) - 1; // [-1 .. 1]
int OfsY = rand.randInt(4) - 3; // [-3 .. 1]
int OfsZ = rand.randInt(2) - 1; // [-1 .. 1]
BLOCKTYPE DestBlock;
NIBBLETYPE DestMeta;
a_World->GetBlockTypeMeta(a_X + OfsX, a_Y + OfsY, a_Z + OfsZ, DestBlock, DestMeta);
if(DestBlock != E_BLOCK_DIRT)
{
continue;
}
BLOCKTYPE AboveDest;
NIBBLETYPE AboveMeta;
a_World->GetBlockTypeMeta(a_X + OfsX, a_Y + OfsY + 1, a_Z + OfsZ, AboveDest, AboveMeta);
if (g_BlockOneHitDig[AboveDest] || g_BlockTransparent[AboveDest])
{
a_World->FastSetBlock(a_X + OfsX, a_Y + OfsY, a_Z + OfsZ, E_BLOCK_GRASS, 0);
}
} // for i - repeat twice
}
a_World->FastSetBlock(a_X + OfsX, a_Y + OfsY, a_Z + OfsZ, E_BLOCK_GRASS, 0);
}
} // for i - repeat twice
}
};