diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java index 13786d7..5c90550 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java @@ -19,10 +19,10 @@ import java.util.stream.Collectors; public class Board { private List slotList; private Queue tribeDeck; - private List upperListTribe; - private List lowerListTribe; - private List upperListBuilding; - private List lowerListBuilding; + public List upperListTribe; + public List lowerListTribe; + public List upperListBuilding; + public List lowerListBuilding; private int nTotem; private int era; public List getSlotList(){ @@ -85,23 +85,15 @@ public class Board { return lowerListTribe.stream().filter(TribeCard::IsEventCard).map(x->(EventCard)x).collect(Collectors.toCollection(LinkedList::new)); } - public boolean containsUpperTribeCard(TribeCard tribeCard) { - return upperListTribe.contains(tribeCard); - } public boolean removeUpperTribeCard(TribeCard tribeCard) { return upperListTribe.remove(tribeCard); } - public boolean containsLowerTribeCard(TribeCard tribeCard) { - return upperListTribe.contains(tribeCard); - } public boolean removeLowerTribeCard(TribeCard tribeCard) { return upperListTribe.remove(tribeCard); } - public boolean containsUpperBuildingCard(BuildingCard buildingCard) {return upperListTribe.contains(buildingCard);} public boolean removeUpperBuildingCard(BuildingCard buildingCard) { return upperListTribe.remove(buildingCard); } - public boolean containsLowerBuildingCard(BuildingCard buildingCard) {return upperListTribe.contains(buildingCard);} public boolean removeLowerBuildingCard(BuildingCard buildingCard) { return upperListTribe.remove(buildingCard); } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java index cfe56c9..cfb298d 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java @@ -15,7 +15,7 @@ public abstract class OrderLogicCard { players.add(player); } public Player pull(){ - return players.remove(); + return players.poll(); } public Player getFirst() {