Fix: character list in player
This commit is contained in:
@@ -2,6 +2,7 @@ package it.polimi.ingsw.gc14.Model;
|
||||
|
||||
import it.polimi.ingsw.gc14.Model.Cards.BuildingCard;
|
||||
import it.polimi.ingsw.gc14.Model.Cards.TribeCard;
|
||||
import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Character;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -15,8 +16,12 @@ public class Player {
|
||||
}
|
||||
|
||||
private ArrayList <Character> CharacterCards;
|
||||
public ArrayList <TribeCard> getCharacterCards() {
|
||||
return CharacterCards.clone();
|
||||
public ArrayList <Character> getCharacterCards() {
|
||||
ArrayList <Character> copy = new ArrayList <>();
|
||||
for(Character character:CharacterCards){
|
||||
copy.add(character.clone());
|
||||
}
|
||||
return copy;
|
||||
}
|
||||
|
||||
private ArrayList <BuildingCard> BuildingCards;
|
||||
@@ -51,13 +56,6 @@ public class Player {
|
||||
this.UserName = UserName;
|
||||
}
|
||||
|
||||
public void setTribeCards(ArrayList <TribeCard> TribeCards){
|
||||
this.TribeCards = TribeCards;
|
||||
}
|
||||
|
||||
public void setBuildingCards(ArrayList <BuildingCard> BuildingCards){
|
||||
this.BuildingCards = BuildingCards;
|
||||
}
|
||||
|
||||
public void addFood(int Value){
|
||||
this.FoodValue += Value;
|
||||
@@ -87,7 +85,7 @@ public class Player {
|
||||
// Constructors
|
||||
public Player(String UserName){
|
||||
this.UserName = UserName;
|
||||
this.TribeCards = new ArrayList<TribeCard>();
|
||||
this.CharacterCards = new ArrayList<Character>();
|
||||
this.BuildingCards = new ArrayList<BuildingCard>();
|
||||
this.FoodValue = 0;
|
||||
this.PrestigeValue = 0;
|
||||
|
||||
Reference in New Issue
Block a user