StandardPlayer now holds Player and OfflinePlayer, refactoring, more changes to use StandardPlayer