diff options
| -rw-r--r-- | src/Entities/Minecart.cpp | 36 | ||||
| -rw-r--r-- | src/Entities/Minecart.h | 2 |
2 files changed, 11 insertions, 27 deletions
diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp index 9e91eec59..3adf5477e 100644 --- a/src/Entities/Minecart.cpp +++ b/src/Entities/Minecart.cpp @@ -845,24 +845,16 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta) { if (MinecartCollisionCallback.GetCollidedEntityPosition().z >= GetPosZ()) { - if ((-GetSpeedZ() * 0.4) < 0.01) + if (GetSpeedZ() > 0) // True if minecart is moving into the direction of the entity { - AddSpeedZ(-4); - } - else - { - SetSpeedZ(-GetSpeedZ() * 0.4); + SetSpeedZ(0); // Entity handles the pushing } } - else + else // if (MinecartCollisionCallback.GetCollidedEntityPosition().z < GetPosZ()) { - if ((GetSpeedZ() * 0.4) < 0.01) + if (GetSpeedZ() < 0) // True if minecart is moving into the direction of the entity { - AddSpeedZ(4); - } - else - { - SetSpeedZ(GetSpeedZ() * 0.4); + SetSpeedZ(0); // Entity handles the pushing } } return true; @@ -871,24 +863,16 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta) { if (MinecartCollisionCallback.GetCollidedEntityPosition().x >= GetPosX()) { - if ((-GetSpeedX() * 0.4) < 0.01) + if (GetSpeedX() > 0) // True if minecart is moving into the direction of the entity { - AddSpeedX(-4); - } - else - { - SetSpeedX(-GetSpeedX() * 0.4); + SetSpeedX(0); // Entity handles the pushing } } - else + else // if (MinecartCollisionCallback.GetCollidedEntityPosition().x < GetPosX()) { - if ((GetSpeedX() * 0.4) < 0.01) - { - AddSpeedX(4); - } - else + if (GetSpeedX() < 0) // True if minecart is moving into the direction of the entity { - SetSpeedX(GetSpeedX() * 0.4); + SetSpeedX(0); // Entity handles the pushing } } return true; diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h index e48df8fda..c4b1d7f6d 100644 --- a/src/Entities/Minecart.h +++ b/src/Entities/Minecart.h @@ -75,7 +75,7 @@ protected: void SnapToRail(NIBBLETYPE a_RailMeta); /** Tests if a solid block is in front of a cart, and stops the cart (and returns true) if so; returns false if no obstruction */ bool TestBlockCollision(NIBBLETYPE a_RailMeta); - /** Tests if this mincecart's bounding box is intersecting another entity's bounding box (collision) and pushes mincecart away */ + /** Tests if this mincecart's bounding box is intersecting another entity's bounding box (collision) and pushes mincecart away if necessary */ bool TestEntityCollision(NIBBLETYPE a_RailMeta); } ; |