cleaned up playertickhandler after merge

maybe solve some things