Merge pull request #1356 from Azaezel/development

handle pathshapes comming in from above players more gracefully

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)