diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-09-11 19:51:27 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-09-11 19:51:27 +0200 |
| commit | 277b26b4c23e6c68190ca435f36c4a6e2995c058 (patch) | |
| tree | 184a81af8593d1a1422a1e7de40ec2c75b1f8364 /source/Entities/Entity.cpp | |
| parent | Fixed DropSpensers not rotating properly (diff) | |
| download | cuberite-277b26b4c23e6c68190ca435f36c4a6e2995c058.tar cuberite-277b26b4c23e6c68190ca435f36c4a6e2995c058.tar.gz cuberite-277b26b4c23e6c68190ca435f36c4a6e2995c058.tar.bz2 cuberite-277b26b4c23e6c68190ca435f36c4a6e2995c058.tar.lz cuberite-277b26b4c23e6c68190ca435f36c4a6e2995c058.tar.xz cuberite-277b26b4c23e6c68190ca435f36c4a6e2995c058.tar.zst cuberite-277b26b4c23e6c68190ca435f36c4a6e2995c058.zip | |
Diffstat (limited to 'source/Entities/Entity.cpp')
| -rw-r--r-- | source/Entities/Entity.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/Entities/Entity.cpp b/source/Entities/Entity.cpp index 0298ca960..b8596927f 100644 --- a/source/Entities/Entity.cpp +++ b/source/Entities/Entity.cpp @@ -519,11 +519,11 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk) { // Push out entity. - if (NextChunk->GetBlock( RelBlockX + 1, BlockY, RelBlockZ ) == E_BLOCK_AIR) { NextPos.x += 0.2; NextPos.z, NextPos.y = 0; } - else if (NextChunk->GetBlock( RelBlockX - 1, BlockY, RelBlockZ ) == E_BLOCK_AIR) { NextPos.x += -0.2; NextPos.z, NextPos.y = 0; } - else if (NextChunk->GetBlock( RelBlockX, BlockY, RelBlockZ + 1 ) == E_BLOCK_AIR) { NextPos.z += 0.2; NextPos.x, NextPos.y = 0; } - else if (NextChunk->GetBlock( RelBlockX, BlockY, RelBlockZ - 1 ) == E_BLOCK_AIR) { NextPos.z += -0.2; NextPos.x, NextPos.y = 0; } - else { NextPos.y += 0.2; NextPos.z, NextPos.x = 0;} + if (NextChunk->GetBlock( RelBlockX + 1, BlockY, RelBlockZ ) == E_BLOCK_AIR) { NextPos.x += 0.2; } + else if (NextChunk->GetBlock( RelBlockX - 1, BlockY, RelBlockZ ) == E_BLOCK_AIR) { NextPos.x += -0.2; } + else if (NextChunk->GetBlock( RelBlockX, BlockY, RelBlockZ + 1 ) == E_BLOCK_AIR) { NextPos.z += 0.2; } + else if (NextChunk->GetBlock( RelBlockX, BlockY, RelBlockZ - 1 ) == E_BLOCK_AIR) { NextPos.z += -0.2; } + else { NextPos.y += 0.2; } m_bOnGround = true; @@ -648,7 +648,7 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk) } NextPos.Set(Tracer.RealHit.x,Tracer.RealHit.y,Tracer.RealHit.z); NextPos.x += Tracer.HitNormal.x * 0.3f; - NextPos.y += Tracer.HitNormal.y * 0.1f; // Any larger produces entity vibration-upon-the-spot + NextPos.y += Tracer.HitNormal.y * 0.05f; // Any larger produces entity vibration-upon-the-spot NextPos.z += Tracer.HitNormal.z * 0.3f; } else |