Merge pull request #1356 from Azaezel/development

handle pathshapes comming in from above players more gracefully
TorqueGameEngines · Jan 16, 2025 · 2216143 · 2216143
2 parents 6b1a811 + 7b393b6
commit 2216143
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Engine/source/T3D/player.cpp b/Engine/source/T3D/player.cpp
@@ -4771,6 +4771,9 @@ void Player::updateAttachment(){
         Point3F(pos.x, pos.y, pos.z - 1.0f ),
         PathShapeObjectType, &rInfo))
     {
+       if ((mJumpSurfaceLastContact < JumpSkipContactsMax) && !mSwimming)
+          setPosition(rInfo.point, getRotation());
+
        if( rInfo.object->getTypeMask() & PathShapeObjectType) //Ramen
        {
           if (getParent() == NULL)