diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-09-09 19:55:42 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-09-09 19:55:42 +0200 |
| commit | 57c17a02dba12011bb776280b55fc9eb93bee186 (patch) | |
| tree | e5adc215fd246b051b296511babd9864176d9b5f /source/Entities/Minecart.cpp | |
| parent | Fixed formatting and removed gravity thing (diff) | |
| download | cuberite-57c17a02dba12011bb776280b55fc9eb93bee186.tar cuberite-57c17a02dba12011bb776280b55fc9eb93bee186.tar.gz cuberite-57c17a02dba12011bb776280b55fc9eb93bee186.tar.bz2 cuberite-57c17a02dba12011bb776280b55fc9eb93bee186.tar.lz cuberite-57c17a02dba12011bb776280b55fc9eb93bee186.tar.xz cuberite-57c17a02dba12011bb776280b55fc9eb93bee186.tar.zst cuberite-57c17a02dba12011bb776280b55fc9eb93bee186.zip | |
Diffstat (limited to 'source/Entities/Minecart.cpp')
| -rw-r--r-- | source/Entities/Minecart.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/Entities/Minecart.cpp b/source/Entities/Minecart.cpp index 0c0b7b58a..f633206a2 100644 --- a/source/Entities/Minecart.cpp +++ b/source/Entities/Minecart.cpp @@ -105,9 +105,6 @@ void cMinecart::HandleRailPhysics(float a_Dt, cChunk & a_Chunk) SpeedY = 0; // Don't move vertically as on ground SpeedX = 0; // Correct diagonal movement from curved rails - // Set Y as current Y rounded up to bypass friction - SetPosY(floor(GetPosY())); - if (SpeedZ != 0) // Don't do anything if cart is stationary { if (SpeedZ > 0) @@ -130,8 +127,6 @@ void cMinecart::HandleRailPhysics(float a_Dt, cChunk & a_Chunk) SpeedY = 0; SpeedZ = 0; - SetPosY(floor(GetPosY())); - if (SpeedX != 0) { if (SpeedX > 0) @@ -347,7 +342,7 @@ void cMinecart::DoTakeDamage(TakeDamageInfo & TDI) { super::DoTakeDamage(TDI); - if (GetHealth() == 0) + if (GetHealth() <= 0) { Destroy(true); } |