Revert "Revert "Rewrote jumping -- less buggy""

This reverts commit fce997c3d3dc51626df093f0828b6c7cfa464d06.