summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-03-02 16:13:43 +0100
committerMattes D <github@xoft.cz>2014-03-02 16:13:43 +0100
commitb17d04737d11c5698a6869c70031646723d79f11 (patch)
treed71275553552a16dd2b9ba949cd5abf8baf9fa5a /src/Entities/Entity.cpp
parentMerge pull request #745 from tonibm19/master (diff)
parentGetById => Get (diff)
downloadcuberite-b17d04737d11c5698a6869c70031646723d79f11.tar
cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.gz
cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.bz2
cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.lz
cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.xz
cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.zst
cuberite-b17d04737d11c5698a6869c70031646723d79f11.zip
Diffstat (limited to 'src/Entities/Entity.cpp')
-rw-r--r--src/Entities/Entity.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 8554ab2a5..96e8c15a5 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -582,11 +582,11 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
int RelBlockZ = BlockZ - (NextChunk->GetPosZ() * cChunkDef::Width);
BLOCKTYPE BlockIn = NextChunk->GetBlock( RelBlockX, BlockY, RelBlockZ );
BLOCKTYPE BlockBelow = (BlockY > 0) ? NextChunk->GetBlock(RelBlockX, BlockY - 1, RelBlockZ) : E_BLOCK_AIR;
- if (!g_BlockIsSolid[BlockIn]) // Making sure we are not inside a solid block
+ if (!cBlockInfo::IsSolid(BlockIn)) // Making sure we are not inside a solid block
{
if (m_bOnGround) // check if it's still on the ground
{
- if (!g_BlockIsSolid[BlockBelow]) // Check if block below is air or water.
+ if (!cBlockInfo::IsSolid(BlockBelow)) // Check if block below is air or water.
{
m_bOnGround = false;
}
@@ -616,7 +616,7 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
// The pickup is too close to an unloaded chunk, bail out of any physics handling
return;
}
- if (!g_BlockIsSolid[GotBlock])
+ if (!cBlockInfo::IsSolid(GotBlock))
{
NextPos.x += gCrossCoords[i].x;
NextPos.z += gCrossCoords[i].z;