Fix state changes for Player, waves did cause a bug