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

Flowers, mushrooms and air are no longer collidable.

Browse Source
This commit is contained in:
Samuel Barney 2013-11-04 17:14:49 -07:00
parent 3002dc8bbf
commit 96ef6084ae
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/Tracer.cpp
View File

@ -225,15 +225,24 @@ int cTracer::Trace( const Vector3f & a_Start, const Vector3f & a_Direction, int
BLOCKTYPE BlockID = m_World->GetBlock(pos.x, pos.y, pos.z); BLOCKTYPE BlockID = m_World->GetBlock(pos.x, pos.y, pos.z);
// No collision with water ;) // No collision with water ;)
if ((BlockID != E_BLOCK_AIR) || IsBlockWater(BlockID)) // _X 2013_03_29: Why is the IsBlockWater condition here? water equals air? switch(BlockID)
{ {
BlockHitPosition = pos; case E_BLOCK_AIR:
int Normal = GetHitNormal(a_Start, End, pos ); case E_BLOCK_YELLOW_FLOWER:
if(Normal > 0) case E_BLOCK_RED_ROSE:
case E_BLOCK_RED_MUSHROOM:
case E_BLOCK_BROWN_MUSHROOM:
break;
default:
{ {
HitNormal = m_NormalTable[Normal-1]; BlockHitPosition = pos;
int Normal = GetHitNormal(a_Start, End, pos );
if(Normal > 0)
{
HitNormal = m_NormalTable[Normal-1];
}
return true;
} }
return 1;
} }
} }
return 0; return 0;