Add check for if players are riding entities - should close #1059