diff options
| author | Mattes D <github@xoft.cz> | 2014-03-20 09:05:53 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-03-20 09:05:53 +0100 |
| commit | fe6c03595fb2f45cb2882e4e95672f492a818502 (patch) | |
| tree | 945436381916f1ac3330654f317f3ddfcb872726 /src/Entities/FallingBlock.cpp | |
| parent | Errors in Lua don't include the error handler in the stack trace. (diff) | |
| parent | Added braces (diff) | |
| download | cuberite-fe6c03595fb2f45cb2882e4e95672f492a818502.tar cuberite-fe6c03595fb2f45cb2882e4e95672f492a818502.tar.gz cuberite-fe6c03595fb2f45cb2882e4e95672f492a818502.tar.bz2 cuberite-fe6c03595fb2f45cb2882e4e95672f492a818502.tar.lz cuberite-fe6c03595fb2f45cb2882e4e95672f492a818502.tar.xz cuberite-fe6c03595fb2f45cb2882e4e95672f492a818502.tar.zst cuberite-fe6c03595fb2f45cb2882e4e95672f492a818502.zip | |
Diffstat (limited to 'src/Entities/FallingBlock.cpp')
| -rw-r--r-- | src/Entities/FallingBlock.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/Entities/FallingBlock.cpp b/src/Entities/FallingBlock.cpp index 9fcd9ac80..a66c7e4ae 100644 --- a/src/Entities/FallingBlock.cpp +++ b/src/Entities/FallingBlock.cpp @@ -33,20 +33,16 @@ void cFallingBlock::SpawnOn(cClientHandle & a_ClientHandle) void cFallingBlock::Tick(float a_Dt, cChunk & a_Chunk) { - float MilliDt = a_Dt * 0.001f; - AddSpeedY(MilliDt * -9.8f); - AddPosY(GetSpeedY() * MilliDt); - // GetWorld()->BroadcastTeleportEntity(*this); // Test position - int BlockX = m_OriginalPosition.x; + int BlockX = POSX_TOINT; int BlockY = (int)(GetPosY() - 0.5); - int BlockZ = m_OriginalPosition.z; + int BlockZ = POSZ_TOINT; if (BlockY < 0) { // Fallen out of this world, just continue falling until out of sight, then destroy: - if (BlockY < 100) + if (BlockY < VOID_BOUNDARY) { Destroy(true); } @@ -86,6 +82,15 @@ void cFallingBlock::Tick(float a_Dt, cChunk & a_Chunk) Destroy(true); return; } + + float MilliDt = a_Dt * 0.001f; + AddSpeedY(MilliDt * -9.8f); + AddPosition(GetSpeed() * MilliDt); + + if ((GetSpeedX() != 0) || (GetSpeedZ() != 0)) + { + BroadcastMovementUpdate(); + } } |