Some changes to Player and ServerCatanGame