Fix water jumping again

The previous code does not work if the player jumps off the ground covered with
shallow water (i.e. waterlevel == 1 throughout).