Updated swiming in water
Fixed issues where the keeping track of who is in the End got messed up...