Added tick disabling to the player
Merge