Merge branch Mario/waterjump_fix (S merge request)

Remove the 2 second buffer applied to water jumps and rely on the waterjump flag to be accurate when needed, also check water status on both the server and client before physics is run to ensure they aren't being used from a previous physics frame, fixes various prediction errors with water