summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorMarvin Kopf <marvinkopf@posteo.de>2016-02-16 17:02:05 +0100
committerMarvin Kopf <marvinkopf@posteo.de>2016-02-16 17:02:05 +0100
commitf96903c661a1e0218a73bc5828c23f7f1d875968 (patch)
tree93f6ec8189082d18e7e9d20e732ee11b06843683 /src/Entities
parentMerge pull request #3010 from LogicParrot/stringFix (diff)
downloadcuberite-f96903c661a1e0218a73bc5828c23f7f1d875968.tar
cuberite-f96903c661a1e0218a73bc5828c23f7f1d875968.tar.gz
cuberite-f96903c661a1e0218a73bc5828c23f7f1d875968.tar.bz2
cuberite-f96903c661a1e0218a73bc5828c23f7f1d875968.tar.lz
cuberite-f96903c661a1e0218a73bc5828c23f7f1d875968.tar.xz
cuberite-f96903c661a1e0218a73bc5828c23f7f1d875968.tar.zst
cuberite-f96903c661a1e0218a73bc5828c23f7f1d875968.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Minecart.cpp36
-rw-r--r--src/Entities/Minecart.h2
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);
} ;