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

Merge branch 'master' into achievementtranslate

Browse Source 
Conflicts:
	src/Entities/Player.cpp
This commit is contained in:
Tiger Wang
2014-05-24 23:21:39 +01:00
parent 576e17ae08 2eca98a41a
commit f55f5ec47f
13 changed files with 163 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Entities/Entity.cpp
View File

@@ -1018,10 +1018,10 @@ void cEntity::TickInVoid(cChunk & a_Chunk)
void cEntity::DetectCacti()
void cEntity::DetectCacti(void)
{
int X = POSX_TOINT, Y = POSY_TOINT, Z = POSZ_TOINT;
float w = m_Width / 2;
double w = m_Width / 2;
if (
((Y > 0) && (Y < cChunkDef::Height)) &&
((((X + 1) - GetPosX() < w) && (GetWorld()->GetBlock(X + 1, Y, Z) == E_BLOCK_CACTUS)) ||